BUG 652 leafref CCE & BUG 720 colons problem

[controller.git] / opendaylight / md-sal / sal-netconf-connector / src / main / java / org / opendaylight / controller / sal / connect / netconf / NetconfDevice.xtend

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDevice.xtend b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDevice.xtend
index 12e8b5587caa230cb693610d21f8135f61e9e2e9..0b88c66b4569404f0c8604b9cbac582340ead1a0 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDevice.xtend
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDevice.xtend
@@ -167,8 +167,10 @@ AutoCloseable {
             commitHandlerReg = mountInstance.registerCommitHandler(ROOT_PATH, this);
 
             val rpcs = new ArrayList<RpcRegistration>();
-            for (rpc : mountInstance.schemaContext.operations) {
-                rpcs.add(mountInstance.addRpcImplementation(rpc.QName, this));
+            if (mountInstance != null && schemaContext.isPresent) {
+                for (rpc : mountInstance.schemaContext.operations) {
+                    rpcs.add(mountInstance.addRpcImplementation(rpc.QName, this));
+                }
             }
             rpcReg = rpcs
         }