From 3bce14bcfb0302d6141e19b719c42dd5ed0fb9a5 Mon Sep 17 00:00:00 2001
From: Anna Bencurova <Anna.Bencurova@pantheon.tech>
Date: Thu, 10 Jan 2019 15:21:17 +0100
Subject: [PATCH] Fix preparing result of action

NullPointerException was thrown when action with no output
was defined and used and OK reply returned.

Change-Id: I2bcf846c501a650d754c943d2e1dc69e73a8dd37
JIRA: NETCONF-567
Signed-off-by: Anna Bencurova <Anna.Bencurova@pantheon.tech>
---
 .../netconf/schema/mapping/NetconfMessageTransformer.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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,
-- 
2.36.6