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%2FCommitTransaction.java;h=52ab643ad838987f32e0158811b177bef635023d;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hp=d607fe50fef33bc170c58088f2243dd7100c885b;hpb=73e969cf365dd78772596c71e940ae44fe2f22d3;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java
index d607fe50fe..52ab643ad8 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java
@@ -8,30 +8,37 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
+import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
 import org.opendaylight.controller.protobuff.messages.cohort3pc.ThreePhaseCommitCohortMessages;
 
-public class CommitTransaction implements SerializableMessage {
-    public static final Class<ThreePhaseCommitCohortMessages.CommitTransaction> SERIALIZABLE_CLASS =
-            ThreePhaseCommitCohortMessages.CommitTransaction.class;
+public class CommitTransaction extends AbstractThreePhaseCommitMessage {
+    private static final long serialVersionUID = 1L;
 
-    private final String transactionID;
-
-    public CommitTransaction(String transactionID) {
-        this.transactionID = transactionID;
+    public CommitTransaction() {
     }
 
-    public String getTransactionID() {
-        return transactionID;
+    public CommitTransaction(String transactionID, final short version) {
+        super(transactionID, version);
     }
 
+    @Deprecated
     @Override
-    public Object toSerializable() {
+    protected Object newLegacySerializedInstance() {
         return ThreePhaseCommitCohortMessages.CommitTransaction.newBuilder().setTransactionId(
-                transactionID).build();
+                getTransactionID()).build();
+    }
+
+    public static CommitTransaction fromSerializable(Object serializable) {
+        if(serializable instanceof CommitTransaction) {
+            return (CommitTransaction)serializable;
+        } else {
+            return new CommitTransaction(((ThreePhaseCommitCohortMessages.CommitTransaction)serializable).
+                    getTransactionId(), DataStoreVersions.LITHIUM_VERSION);
+        }
     }
 
-    public static CommitTransaction fromSerializable(Object message) {
-        return new CommitTransaction(((ThreePhaseCommitCohortMessages.
-                CommitTransaction)message).getTransactionId());
+    public static boolean isSerializedType(Object message) {
+        return message instanceof CommitTransaction ||
+                message instanceof ThreePhaseCommitCohortMessages.CommitTransaction;
     }
 }