X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fschema%2Fmapping%2FNetconfMessageTransformer.java;h=1c390fb903145a3d4c4202a7ba74ec6c96977ca8;hb=3bce14bcfb0302d6141e19b719c42dd5ed0fb9a5;hp=0df0e1aa74bda1b3c95df680fcfe0c787fd9a138;hpb=d3d7994e995c8116e6db070a8f89699c4b305da1;p=netconf.git

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
index 0df0e1aa74..1c390fb903 100644
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
@@ -316,7 +316,11 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
         Preconditions.checkNotNull(actionDefinition, "Action does not exist: %s", action);
         ContainerNode normalizedNode = (ContainerNode) parseResult(message, actionDefinition);
 
-        return new SimpleDOMActionResult(normalizedNode, Collections.<RpcError>emptyList());
+        if (normalizedNode == null) {
+            return new SimpleDOMActionResult(Collections.<RpcError>emptyList());
+        } else {
+            return new SimpleDOMActionResult(normalizedNode, Collections.<RpcError>emptyList());
+        }
     }
 
     private NormalizedNode<?, ?> parseResult(final NetconfMessage message,