X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=netconf%2Fnetconf-topology-singleton%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Ftopology%2Fsingleton%2Fimpl%2Fnetconf%2FActorProxyNetconfServiceFacade.java;h=b27aa8ba3f0ddf1f80b03021efb242c9d2547ffa;hb=622b6917095076cbdb8478863cdd5fad2988f65a;hp=aacc34cedb447be02829bd41a5f46a5dd61a25ec;hpb=7d83179b4d81e63eeb5c1c1adf4794c6e74c5709;p=netconf.git

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/netconf/ActorProxyNetconfServiceFacade.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/netconf/ActorProxyNetconfServiceFacade.java
index aacc34cedb..b27aa8ba3f 100644
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/netconf/ActorProxyNetconfServiceFacade.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/netconf/ActorProxyNetconfServiceFacade.java
@@ -15,13 +15,13 @@ import akka.dispatch.OnComplete;
 import akka.pattern.AskTimeoutException;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
@@ -243,7 +243,7 @@ public class ActorProxyNetconfServiceFacade implements ProxyNetconfServiceFacade
     }
 
     @Override
-    public @NonNull Object getDeviceId() {
+    public Object getDeviceId() {
         return id;
     }
 
@@ -288,10 +288,9 @@ public class ActorProxyNetconfServiceFacade implements ProxyNetconfServiceFacade
             ? NetconfTopologyUtils.createMasterIsDownException(id, (Exception) failure) : failure;
     }
 
-    private ListenableFuture<? extends DOMRpcResult> createResult() {
-        final SettableFuture<DOMRpcResult> settableFuture = SettableFuture.create();
-        settableFuture.set(new DefaultDOMRpcResult());
-        return settableFuture;
+    // FIXME: this is being used in contexts where we should be waiting for a reply
+    private static ListenableFuture<? extends DOMRpcResult> createResult() {
+        return Futures.immediateFuture(new DefaultDOMRpcResult());
     }
 
     private static DOMRpcResult mapInvokeRpcMessageReplyToDOMRpcResult(final InvokeRpcMessageReply reply) {