BUG-5280: fix compilation after unrebased merge 78/43778/1
authorRobert Varga <rovarga@cisco.com>
Fri, 12 Aug 2016 12:03:54 +0000 (14:03 +0200)
committerRobert Varga <rovarga@cisco.com>
Fri, 12 Aug 2016 12:03:54 +0000 (14:03 +0200)
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 <rovarga@cisco.com>
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java

index 44ffdeb..6f07390 100644 (file)
@@ -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,

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.