*/
package org.opendaylight.controller.cluster.datastore.messages;
+import akka.actor.ExtendedActorSystem;
import akka.serialization.JSerializer;
+import akka.util.ClassLoaderObjectInputStream;
import com.google.common.base.Preconditions;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
import org.apache.commons.lang3.SerializationUtils;
import org.opendaylight.controller.cluster.datastore.utils.AbstractBatchedModificationsCursor;
* shards.
*/
public final class ReadyLocalTransactionSerializer extends JSerializer {
+
+ private final ExtendedActorSystem system;
+
+ public ReadyLocalTransactionSerializer(final ExtendedActorSystem system) {
+ this.system = Preconditions.checkNotNull(system);
+ }
+
@Override
public int identifier() {
return 97439437;
@Override
public Object fromBinaryJava(final byte[] bytes, final Class<?> clazz) {
- return SerializationUtils.deserialize(bytes);
+ try (ClassLoaderObjectInputStream is = new ClassLoaderObjectInputStream(system.dynamicAccess().classLoader(),
+ new ByteArrayInputStream(bytes))) {
+ return is.readObject();
+ } catch (IOException | ClassNotFoundException e) {
+ throw new IllegalStateException("Failed to deserialize object", e);
+ }
}
private static final class BatchedCursor extends AbstractBatchedModificationsCursor {
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import akka.actor.ExtendedActorSystem;
+import akka.testkit.JavaTestKit;
import java.io.NotSerializableException;
import java.util.List;
import org.junit.Test;
TransactionIdentifier txId = nextTransactionId();
ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, true);
- ReadyLocalTransactionSerializer serializer = new ReadyLocalTransactionSerializer();
-
- byte[] bytes = serializer.toBinary(readyMessage);
-
- Object deserialized = serializer.fromBinary(bytes, ReadyLocalTransaction.class);
+ final ExtendedActorSystem system = (ExtendedActorSystem) ExtendedActorSystem.create("test");
+ final Object deserialized;
+ try {
+ final ReadyLocalTransactionSerializer serializer = new ReadyLocalTransactionSerializer(system);
+ final byte[] bytes = serializer.toBinary(readyMessage);
+ deserialized = serializer.fromBinary(bytes, ReadyLocalTransaction.class);
+ } finally {
+ JavaTestKit.shutdownActorSystem(system);
+ }
assertNotNull("fromBinary returned null", deserialized);
assertEquals("fromBinary return type", BatchedModifications.class, deserialized.getClass());