BUG-7033: Fix commit exception due to pipe-lining

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / messages / ForwardedReadyTransaction.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java
index b995192113e1ad088b88c0ed7b2925d58abba42e..9cd5e66d06c59b2c514f171dccc523b5221082e2 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java
@@ -8,6 +8,7 @@
 package org.opendaylight.controller.cluster.datastore.messages;
 
 import com.google.common.base.Preconditions;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.ReadWriteShardDataTreeTransaction;
 
 /**
@@ -16,34 +17,27 @@ import org.opendaylight.controller.cluster.datastore.ReadWriteShardDataTreeTrans
  * @author Thomas Pantelis
  */
 public class ForwardedReadyTransaction {
-    private final String transactionID;
+    private final TransactionIdentifier transactionId;
     private final ReadWriteShardDataTreeTransaction transaction;
-    private final boolean returnSerialized;
     private final boolean doImmediateCommit;
     private final short txnClientVersion;
 
-    public ForwardedReadyTransaction(String transactionID, short txnClientVersion,
-            ReadWriteShardDataTreeTransaction transaction, boolean returnSerialized,
-            boolean doImmediateCommit) {
-        this.transactionID = Preconditions.checkNotNull(transactionID);
+    public ForwardedReadyTransaction(TransactionIdentifier transactionId, short txnClientVersion,
+            ReadWriteShardDataTreeTransaction transaction, boolean doImmediateCommit) {
+        this.transactionId = Preconditions.checkNotNull(transactionId);
         this.transaction = Preconditions.checkNotNull(transaction);
-        this.returnSerialized = returnSerialized;
         this.txnClientVersion = txnClientVersion;
         this.doImmediateCommit = doImmediateCommit;
     }
 
-    public String getTransactionID() {
-        return transactionID;
+    public TransactionIdentifier getTransactionId() {
+        return transactionId;
     }
 
     public ReadWriteShardDataTreeTransaction getTransaction() {
         return transaction;
     }
 
-    public boolean isReturnSerialized() {
-        return returnSerialized;
-    }
-
     public short getTxnClientVersion() {
         return txnClientVersion;
     }
@@ -54,7 +48,7 @@ public class ForwardedReadyTransaction {
 
     @Override
     public String toString() {
-        return "ForwardedReadyTransaction [transactionID=" + transactionID + ", doImmediateCommit=" + doImmediateCommit
+        return "ForwardedReadyTransaction [transactionId=" + transactionId + ", doImmediateCommit=" + doImmediateCommit
                 + ", txnClientVersion=" + txnClientVersion + "]";
     }
 }