Fix preparing result of action

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / schema / mapping / NetconfMessageTransformer.java

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 0df0e1aa74bda1b3c95df680fcfe0c787fd9a138..1c390fb903145a3d4c4202a7ba74ec6c96977ca8 100644 (file)
--- 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,