Skip to content

Commit 5527560

Browse files
author
loushaokun
committed
Block some serializers that are currently not available on Android in the Android environment
1 parent 6a98d8c commit 5527560

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

java/fory-core/src/main/java/org/apache/fory/resolver/ClassResolver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,11 @@ private void addDefaultSerializers() {
345345
CollectionSerializers.registerDefaultSerializers(fory);
346346
MapSerializers.registerDefaultSerializers(fory);
347347
addDefaultSerializer(Locale.class, new LocaleSerializer(fory));
348-
addDefaultSerializer(
348+
if (!Platform.IS_ANDROID) {
349+
addDefaultSerializer(
349350
LambdaSerializer.ReplaceStub.class,
350351
new LambdaSerializer(fory, LambdaSerializer.ReplaceStub.class));
352+
}
351353
addDefaultSerializer(
352354
JdkProxySerializer.ReplaceStub.class,
353355
new JdkProxySerializer(fory, JdkProxySerializer.ReplaceStub.class));

java/fory-core/src/main/java/org/apache/fory/serializer/collection/CollectionSerializers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ public static void registerDefaultSerializers(Fory fory) {
820820
CopyOnWriteArrayList.class,
821821
new CopyOnWriteArrayListSerializer(fory, CopyOnWriteArrayList.class));
822822
final Class setFromMapClass = Collections.newSetFromMap(new HashMap<>()).getClass();
823-
resolver.registerSerializer(setFromMapClass, new SetFromMapSerializer(fory, setFromMapClass));
823+
if (!Platform.IS_ANDROID) resolver.registerSerializer(setFromMapClass, new SetFromMapSerializer(fory, setFromMapClass));
824824
resolver.registerSerializer(
825825
ConcurrentHashMap.KeySetView.class,
826826
new ConcurrentHashMapKeySetViewSerializer(fory, ConcurrentHashMap.KeySetView.class));

0 commit comments

Comments
 (0)