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%2FAbortTransaction.java;h=25c13989d599a153a3680d78336f4662984a894f;hb=7a38f0591bc527178510d749ae361e317dcc9788;hp=e70ced86e3f9f8ab989a528e4906fc725c73d1a2;hpb=5a4560d475f0ed328275f1a5c7a5dae292acfb02;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransaction.java
index e70ced86e3..25c13989d5 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransaction.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 AbortTransaction extends AbstractThreePhaseCommitMessage {
     private static final long serialVersionUID = 1L;
@@ -17,27 +17,16 @@ public class AbortTransaction extends AbstractThreePhaseCommitMessage {
     public AbortTransaction() {
     }
 
-    public AbortTransaction(String transactionID, final short version) {
+    public AbortTransaction(TransactionIdentifier transactionID, final short version) {
         super(transactionID, version);
     }
 
-    @Override
-    protected Object newLegacySerializedInstance() {
-        return ThreePhaseCommitCohortMessages.AbortTransaction.newBuilder().
-                setTransactionId(getTransactionID()).build();
-    }
-
     public static AbortTransaction fromSerializable(Object serializable) {
-        if(serializable instanceof AbortTransaction) {
-            return (AbortTransaction)serializable;
-        } else {
-            return new AbortTransaction(((ThreePhaseCommitCohortMessages.AbortTransaction)serializable).
-                    getTransactionId(), DataStoreVersions.LITHIUM_VERSION);
-        }
+        Preconditions.checkArgument(serializable instanceof AbortTransaction);
+        return (AbortTransaction)serializable;
     }
 
     public static boolean isSerializedType(Object message) {
-        return message instanceof AbortTransaction ||
-                message instanceof ThreePhaseCommitCohortMessages.AbortTransaction;
+        return message instanceof AbortTransaction;
     }
 }