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%2Fsharding%2FPrefixedShardConfigWriter.java;h=0342a1351748aa77f2020bb179198ddf5bace2a9;hb=3980617d0cbe4279f5518a7d828b98989199d363;hp=b0507f6383da8e24b7c936432fa06f588a6e414e;hpb=149feb98f151186975fe42bab5853e05aafd4b51;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java
index b0507f6383..0342a13517 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigWriter.java
@@ -88,7 +88,7 @@ class PrefixedShardConfigWriter {
         submitBlocking(cohort);
     }
 
-    private void submitBlocking(final DOMStoreThreePhaseCommitCohort cohort) {
+    private static void submitBlocking(final DOMStoreThreePhaseCommitCohort cohort) {
         try {
             doSubmit(cohort).get();
         } catch (final InterruptedException | ExecutionException e) {
@@ -96,7 +96,7 @@ class PrefixedShardConfigWriter {
         }
     }
 
-    private ListenableFuture<Void> doSubmit(final DOMStoreThreePhaseCommitCohort cohort) {
+    private static ListenableFuture<Void> doSubmit(final DOMStoreThreePhaseCommitCohort cohort) {
         final AsyncFunction<Boolean, Void> validateFunction = input -> cohort.preCommit();
         final AsyncFunction<Void, Void> prepareFunction = input -> cohort.commit();
 
@@ -117,6 +117,8 @@ class PrefixedShardConfigWriter {
         } catch (final ReadFailedException e) {
             LOG.error("Presence check of default shard in configuration failed.", e);
             return false;
+        } finally {
+            snapshot.abort();
         }
     }