X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fconnect%2Fnetconf%2FNetconfDevice.xtend;fp=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fconnect%2Fnetconf%2FNetconfDevice.xtend;h=0b88c66b4569404f0c8604b9cbac582340ead1a0;hb=a72a0a1f866a407b89fe70faf16c1b55ba98daa0;hp=12e8b5587caa230cb693610d21f8135f61e9e2e9;hpb=860206dfce8edb0fe74be842d2101f0eac7db2bd;p=controller.git

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 12e8b5587c..0b88c66b45 100644
--- 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
         }