From 8f4ecef712ddc36883617d23c17b3f6193e36946 Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Tue, 7 Apr 2015 15:15:58 +0200 Subject: [PATCH] Fixed NPE when RuntimeRpc could not find module in schemaContext. Change-Id: I40c72d413f23753e95fd5f0bb42cc78046a6494f Signed-off-by: Tomas Cere --- .../controller/netconf/mdsal/connector/ops/RuntimeRpc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/RuntimeRpc.java b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/RuntimeRpc.java index ff7d30d574..a3cd3c7afa 100644 --- a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/RuntimeRpc.java +++ b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/RuntimeRpc.java @@ -110,7 +110,7 @@ public class RuntimeRpc extends AbstractSingletonNetconfOperation { //this returns module with the newest revision if more then 1 module with same namespace is found private Optional getModule(final URI namespaceURI) { - return Optional.of(schemaContext.getCurrentContext().findModuleByNamespaceAndRevision(namespaceURI, null)); + return Optional.fromNullable(schemaContext.getCurrentContext().findModuleByNamespaceAndRevision(namespaceURI, null)); } private Optional getRpcDefinitionFromModule(Module module, URI namespaceURI, String name) { -- 2.36.6