Bug 6540: EOS - Rework behavior of onPeerDown

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / ShardTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
index 363450704d0c2809953c8b311bfcb883f4b970b9..e4ca64ffe812b2422308287945e4106a749a65a5 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
@@ -897,7 +897,7 @@ public class ShardTest extends AbstractShardTest {
                         }
 
                         @Override
-                        protected ActorSelection getLeader() {
+                        public ActorSelection getLeader() {
                             return overrideLeaderCalls.get() ? getSystem().actorSelection(getRef().path()) :
                                 super.getLeader();
                         }
@@ -1427,19 +1427,14 @@ public class ShardTest extends AbstractShardTest {
     @Test
     public void testAbortWithCommitPending() throws Throwable {
         new ShardTestKit(getSystem()) {{
-            final Creator<Shard> creator = new Creator<Shard>() {
+            final Creator<Shard> creator = () -> new Shard(newShardBuilder()) {
                 @Override
-                public Shard create() throws Exception {
-                    return new Shard(newShardBuilder()) {
-                        @Override
-                        void persistPayload(final TransactionIdentifier transactionId, final Payload payload) {
-                            // Simulate an AbortTransaction message occurring during replication, after
-                            // persisting and before finishing the commit to the in-memory store.
+                void persistPayload(final TransactionIdentifier transactionId, final Payload payload) {
+                    // Simulate an AbortTransaction message occurring during replication, after
+                    // persisting and before finishing the commit to the in-memory store.
 
-                            doAbortTransaction(transactionId, null);
-                            super.persistPayload(transactionId, payload);
-                        }
-                    };
+                    doAbortTransaction(transactionId, null);
+                    super.persistPayload(transactionId, payload);
                 }
             };