Merge pull request #87 from magneticflux-/fix#46-immutability-fix

Fix#46 immutability fix
magro · Jan 29, 2018 · 57e38d0 · 57e38d0
2 parents dc6bc93 + 8615c08
commit 57e38d0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/src/main/java/de/javakaffee/kryoserializers/ArraysAsListSerializer.java b/src/main/java/de/javakaffee/kryoserializers/ArraysAsListSerializer.java
@@ -16,23 +16,23 @@
  */
 package de.javakaffee.kryoserializers;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
-
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
 
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * A kryo {@link Serializer} for lists created via {@link Arrays#asList(Object...)}.
  * <p>
  * Note: This serializer does not support cyclic references, so if one of the objects
  * gets set the list as attribute this might cause an error during deserialization.
  * </p>
- * 
+ *
  * @author <a href="mailto:martin.grotzke@javakaffee.de">Martin Grotzke</a>
  */
 public class ArraysAsListSerializer extends Serializer<List<?>> {
@@ -46,8 +46,6 @@ public ArraysAsListSerializer() {
         } catch ( final Exception e ) {
             throw new RuntimeException( e );
         }
-        // Immutable causes #copy(obj) to return the original object
-        setImmutable(true);
     }
 
     @Override
@@ -87,6 +85,18 @@ public void write(final Kryo kryo, final Output output, final List<?> obj) {
         }
     }
 
+    @Override
+    public List<?> copy(Kryo kryo, List<?> original) {
+        try {
+            final Object[] array = (Object[]) _arrayField.get(original);
+            kryo.reference(array);
+            Object[] arrayCopy = kryo.copy(array);
+            return Arrays.asList(arrayCopy);
+        } catch (final Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static Class<?> getPrimitiveWrapperClass(final Class<?> c) {
         if (c.isPrimitive()) {
             if (c.equals(Long.TYPE)) {

diff --git a/src/main/java/de/javakaffee/kryoserializers/CollectionsSingletonListSerializer.java b/src/main/java/de/javakaffee/kryoserializers/CollectionsSingletonListSerializer.java
@@ -16,14 +16,14 @@
  */
 package de.javakaffee.kryoserializers;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * A kryo {@link Serializer} for {@link List}s created via {@link Collections#singletonList(Object)}.
  * <p>
@@ -36,7 +36,6 @@
 public class CollectionsSingletonListSerializer extends Serializer<List<?>> {
 
     public CollectionsSingletonListSerializer() {
-        setImmutable(true);
     }
 
     @Override
@@ -50,5 +49,11 @@ public void write(final Kryo kryo, final Output output, final List<?> list) {
         kryo.writeClassAndObject(output, list.get( 0 ));
     }
 
-
+    @Override
+    public List<?> copy(Kryo kryo, List<?> original) {
+        Object singleton = original.get(0);
+        kryo.reference(singleton);
+        Object newSingleton = kryo.copy(singleton);
+        return Collections.singletonList(newSingleton);
+    }
 }