X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FLocalTransactionContext.java;h=76bafb75d3003a911f1b1207f55a919b0c08e2f0;hp=a6e42c4c706ba70eb916b8393b549593b7e6f28b;hb=95c296a7c1e8e186a88a0a0dc82e080b2185db33;hpb=74926cb05f2e5e4937658ca61444f7d7c846eb00

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
index a6e42c4c70..76bafb75d3 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
@@ -12,7 +12,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.SettableFuture;
-import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
 import org.opendaylight.controller.cluster.datastore.modification.AbstractModification;
 import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
@@ -43,9 +43,10 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     protected abstract DOMStoreReadTransaction getReadDelegate();
 
     @Override
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public void executeModification(AbstractModification modification) {
         incrementModificationCount();
-        if(operationError == null) {
+        if (operationError == null) {
             try {
                 modification.apply(getWriteDelegate());
             } catch (Exception e) {
@@ -63,8 +64,8 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
             }
 
             @Override
-            public void onFailure(final Throwable t) {
-                proxyFuture.setException(t);
+            public void onFailure(final Throwable failure) {
+                proxyFuture.setException(failure);
             }
         });
     }
@@ -86,11 +87,6 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
         return cohort.initiateDirectCommit();
     }
 
-    @Override
-    public boolean supportsDirectCommit() {
-        return true;
-    }
-
     @Override
     public void closeTransaction() {
         txDelegate.close();