commit dc747af4a1664fc1cfb03ddd19726eb574895a1c
author Henry Yu <hyu2010b@gmail.com> Wed Nov 16 13:29:54 2016 -0500
committer Thomas Vachuska <tom@onlab.us> Wed Nov 30 18:11:26 2016 +0000
tree ab35133b2d6c7aade3791c2d48837f0bf20955e9
parent c3f9b65976f2c0d853c88344035b18c07aa85bb4

[ONOS-5675][ONOS-5676] RESTCONF JIRA fixes

This submission contains the fixes for the following 3 problems:

1. [ONOS-5675] RESTCONF clients may stop receiving notifications when multiple client
               sessions are opened simultaneously
2. [ONOS-5676] RESTCONF client hangs on event notification subscription
3. bug fix for empty-leaf node

Change-Id: Icf6848d18e0599842d4889d5aa5443c58f23aeeb

protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java

diff --git a/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java b/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java
index 546bed7..cf4e690 100755
--- a/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java
+++ b/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java
@@ -48,6 +48,7 @@
     private static final int INPUT_FIELD_LENGTH = 2;
     private static final String E_UNSUP_TYPE = "Unsupported node type %s " +
             "field name is %s fieldName";
+    private static final String EMPTY_STRING = "null";
 
     private Logger log = getLogger(getClass());
 
@@ -140,7 +141,8 @@
     }
 
     private void processLeafNode(NormalizedYangNode node, String value) {
-        ydtBuilder.addLeaf(node.getName(), node.getNamespace(), value);
+        String leafValue = value.equalsIgnoreCase(EMPTY_STRING) ? null : value;
+        ydtBuilder.addLeaf(node.getName(), node.getNamespace(), leafValue);
     }
 
     private void processArrayNode(NormalizedYangNode normalizedNode,