commit c836ad18511a525bd9fdd61a4420acba20d86a09
author Thomas Vachuska <tom@opennetworking.org> Wed Nov 29 17:41:53 2017 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Wed Nov 29 17:41:53 2017 +0000
tree 6daa909f739291d936d614da46e5208479e476ac
parent 521b3cf11dc9b114fba03ee43582b8e8db58947c
parent 22d26d4ec69a675a71003b9ce77147e1d4c8594f

Merge "Allow onos-yang-tools to be used with maven lower then 3.3.9"

compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/YangNode.java

diff --git a/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/YangNode.java b/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/YangNode.java
index 842bca1..48b739e 100644
--- a/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/YangNode.java
+++ b/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/YangNode.java
@@ -1026,7 +1026,10 @@
      */
     public void setParentContext() {
         if (this instanceof SchemaDataNode) {
-            parentContext = getParentSchemaContext(this.getParent());
+            SchemaContext t = getParentSchemaContext(this.getParent());
+            if (t != null) {
+                parentContext = t;
+            }
 
             // As rpc and anydata node is not leaf holder
             if (nodeType != RPC_NODE && nodeType != ANYDATA_NODE) {