Merge "Bug 2265: Address comments from 12448"

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java
index 7db4846ef4ff69c4c318ab459a07cc09b7943a47..7e8cd436d2ce0133d612eaa0ec2ad31ec57b54c9 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java
@@ -17,13 +17,16 @@ public class CanCommitTransactionReply implements SerializableMessage {
     public static final CanCommitTransactionReply YES = new CanCommitTransactionReply(true);
     public static final CanCommitTransactionReply NO = new CanCommitTransactionReply(false);
 
+    private static final ThreePhaseCommitCohortMessages.CanCommitTransactionReply YES_SERIALIZED =
+            ThreePhaseCommitCohortMessages.CanCommitTransactionReply.newBuilder().setCanCommit(true).build();
+
+    private static final ThreePhaseCommitCohortMessages.CanCommitTransactionReply NO_SERIALIZED =
+            ThreePhaseCommitCohortMessages.CanCommitTransactionReply.newBuilder().setCanCommit(false).build();
+
     private final boolean canCommit;
-    private final Object serializedMessage;
 
     private CanCommitTransactionReply(final boolean canCommit) {
         this.canCommit = canCommit;
-        this.serializedMessage = ThreePhaseCommitCohortMessages.CanCommitTransactionReply.newBuilder().
-                setCanCommit(canCommit).build();
     }
 
     public boolean getCanCommit() {
@@ -32,7 +35,7 @@ public class CanCommitTransactionReply implements SerializableMessage {
 
     @Override
     public Object toSerializable() {
-        return serializedMessage;
+        return canCommit ? YES_SERIALIZED : NO_SERIALIZED;
     }
 
     public static CanCommitTransactionReply fromSerializable(final Object message) {

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
index 9234385b3536bfbe8ccaf528075efcdedc1be792..ae0d630cf267aa75b0ef403b8df7e7733d06e082 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
@@ -55,7 +55,7 @@ public class MergeData extends ModifyData implements VersionedSerializableMessag
     }
 
     public static boolean isSerializedType(Object message) {
-        return SERIALIZABLE_CLASS.isAssignableFrom(message.getClass()) ||
+        return SERIALIZABLE_CLASS.isInstance(message) ||
                message instanceof ShardTransactionMessages.MergeData;
     }
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/WriteData.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/WriteData.java
index c5e3a6b05966c9c30f12c5f6f7dab93a78fbebf7..989949c88fb0f0c5400ea903119435a6d4ed0940 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/WriteData.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/WriteData.java
@@ -55,7 +55,7 @@ public class WriteData extends ModifyData implements VersionedSerializableMessag
     }
 
     public static boolean isSerializedType(Object message) {
-        return SERIALIZABLE_CLASS.isAssignableFrom(message.getClass()) ||
+        return SERIALIZABLE_CLASS.isInstance(message) ||
                message instanceof ShardTransactionMessages.WriteData;
     }
 }