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%2FReadyLocalTransactionSerializer.java;h=fc5a99fe9adf88d05a386429345e30ead5944f33;hb=dd16edd5a758f0e51727de511f9868c72b2a1dd0;hp=1091aa50706338b9a45e9bb12723f979a905dc48;hpb=376df7be9839100e31e6916d6e685dda9f8bd030;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java index 1091aa5070..fc5a99fe9a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java @@ -14,7 +14,6 @@ import java.util.ArrayDeque; import java.util.Deque; import javax.annotation.Nonnull; import org.apache.commons.lang3.SerializationUtils; -import org.opendaylight.controller.cluster.datastore.DataStoreVersions; import org.opendaylight.controller.cluster.datastore.modification.DeleteModification; import org.opendaylight.controller.cluster.datastore.modification.MergeModification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; @@ -43,14 +42,14 @@ public final class ReadyLocalTransactionSerializer extends JSerializer { @Override public byte[] toBinary(final Object obj) { Preconditions.checkArgument(obj instanceof ReadyLocalTransaction, "Unsupported object type %s", obj.getClass()); - final ReadyLocalTransaction msg = (ReadyLocalTransaction) obj; - final BatchedModifications batched = new BatchedModifications(msg.getTransactionID(), - DataStoreVersions.CURRENT_VERSION, ""); - batched.setDoCommitOnReady(msg.isDoCommitOnReady()); + final ReadyLocalTransaction readyLocal = (ReadyLocalTransaction) obj; + final BatchedModifications batched = new BatchedModifications(readyLocal.getTransactionID(), + readyLocal.getRemoteVersion(), ""); + batched.setDoCommitOnReady(readyLocal.isDoCommitOnReady()); batched.setTotalMessagesSent(1); batched.setReady(true); - msg.getModification().applyToCursor(new BatchedCursor(batched)); + readyLocal.getModification().applyToCursor(new BatchedCursor(batched)); return SerializationUtils.serialize(batched); }