Adjust to yangtools-2.0.0/odlparent-3.0.0 changes

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / sal / tx / WriteRunningTx.java

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java
index af51c824ef1883eac9b2252756a1df309afbe351..ddc66fb5f1757080cc1ed4e5feb24b27ad1f76fe 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java
@@ -13,6 +13,7 @@ import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
@@ -73,7 +74,7 @@ public class WriteRunningTx extends AbstractWriteTx {
     @Override
     public synchronized CheckedFuture<Void, TransactionCommitFailedException> submit() {
         final ListenableFuture<Void> commmitFutureAsVoid = Futures.transform(commit(),
-                (Function<RpcResult<TransactionStatus>, Void>) input -> null);
+                (Function<RpcResult<TransactionStatus>, Void>) input -> null, MoreExecutors.directExecutor());
 
         return Futures.makeChecked(commmitFutureAsVoid,
             input -> new TransactionCommitFailedException("Submit of transaction " + getIdentifier() + " failed",
@@ -102,12 +103,12 @@ public class WriteRunningTx extends AbstractWriteTx {
         netOps.unlockRunning(new NetconfRpcFutureCallback("Unlock running", id));
     }
 
-    private static class Change {
+    private static final class Change {
 
         private final DataContainerChild<?, ?> editStructure;
         private final Optional<ModifyAction> defaultOperation;
 
-        private Change(final DataContainerChild<?, ?> editStructure, final Optional<ModifyAction> defaultOperation) {
+        Change(final DataContainerChild<?, ?> editStructure, final Optional<ModifyAction> defaultOperation) {
             this.editStructure = editStructure;
             this.defaultOperation = defaultOperation;
         }