X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FCanCommitTransaction.java;h=087c7b6376bd44760b8486804b99cc157581d594;hb=bdce894fa73714aa9f68eadad3524cfc94dc71d2;hp=4aff686aee6e7380e9de7fd536908de6c60b4de0;hpb=5a4560d475f0ed328275f1a5c7a5dae292acfb02;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java
index 4aff686aee..087c7b6376 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
-import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
-import org.opendaylight.controller.protobuff.messages.cohort3pc.ThreePhaseCommitCohortMessages;
+import com.google.common.base.Preconditions;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 
 public class CanCommitTransaction extends AbstractThreePhaseCommitMessage {
     private static final long serialVersionUID = 1L;
@@ -17,27 +17,16 @@ public class CanCommitTransaction extends AbstractThreePhaseCommitMessage {
     public CanCommitTransaction() {
     }
 
-    public CanCommitTransaction(String transactionID, final short version) {
+    public CanCommitTransaction(TransactionIdentifier transactionID, final short version) {
         super(transactionID, version);
     }
 
-    @Override
-    protected Object newLegacySerializedInstance() {
-        return ThreePhaseCommitCohortMessages.CanCommitTransaction.newBuilder().
-                setTransactionId(getTransactionID()).build();
-    }
-
     public static CanCommitTransaction fromSerializable(Object serializable) {
-        if(serializable instanceof CanCommitTransaction) {
-            return (CanCommitTransaction)serializable;
-        } else {
-            return new CanCommitTransaction(((ThreePhaseCommitCohortMessages.CanCommitTransaction)serializable).
-                    getTransactionId(), DataStoreVersions.LITHIUM_VERSION);
-        }
+        Preconditions.checkArgument(serializable instanceof CanCommitTransaction);
+        return (CanCommitTransaction)serializable;
     }
 
     public static boolean isSerializedType(Object message) {
-        return message instanceof CanCommitTransaction ||
-                message instanceof ThreePhaseCommitCohortMessages.CanCommitTransaction;
+        return message instanceof CanCommitTransaction;
     }
 }