Merge "fix failure during connecting device when channelActive happens later than...

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / rpchandler / RpcHandlerDefault.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/RpcHandlerDefault.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/RpcHandlerDefault.java
index 5a84ea6acb04ab873252b3264873d1c32bdc97e0..04a34b3cb2061d8142a7e9bfd07d4d556337d5c3 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/RpcHandlerDefault.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/RpcHandlerDefault.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netconf.test.tool.rpchandler;
 
 import java.util.Optional;
-import org.opendaylight.controller.config.util.xml.XmlElement;
+import org.opendaylight.netconf.api.xml.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -20,7 +20,7 @@ public class RpcHandlerDefault implements RpcHandler {
     @Override
     public Optional<Document> getResponse(XmlElement rpcElement) {
         LOG.info("getResponse: {}", rpcElement.toString());
-        return null;
+        return Optional.empty();
     }
 
 }