From bfb38b42aa055a2478a5972f15ca4246dee796e9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 12 Aug 2016 14:03:54 +0200 Subject: [PATCH] BUG-5280: fix compilation after unrebased merge Merging the last batch of patches resulted in a mismatch between newly-introduced tests and method movement. Fix that up. Change-Id: I326ad06ff07b902987e397f13f8b0afdb8c45231 Signed-off-by: Robert Varga --- .../controller/cluster/datastore/AbstractShardTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java index 44ffdeb97b..6f07390ba2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java @@ -324,8 +324,7 @@ public abstract class AbstractShardTest extends AbstractActorTest{ BatchedModifications batched = newBatchedModifications(nextTransactionId(), id, node, true, true, 1); DataTreeModification modification = store.getDataTree().takeSnapshot().newModification(); batched.apply(modification); - modification.ready(); - store.applyForeignCandidate(batched.getTransactionID(), store.getDataTree().prepare(modification)); + store.commit(modification); } public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id, @@ -338,8 +337,7 @@ public abstract class AbstractShardTest extends AbstractActorTest{ DataTreeModification modification = store.getDataTree().takeSnapshot().newModification(); batched.apply(modification); - modification.ready(); - store.applyForeignCandidate(batched.getTransactionID(), store.getDataTree().prepare(modification)); + store.commit(modification); } public static void writeToStore(final DataTree store, final YangInstanceIdentifier id, -- 2.36.6