Merge "Do not return null when no RPC is registered"

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / impl / YangParserListenerImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
index f186860c63ee51c5aa7c6277793dc966f5f033e4..222e718650bfbbecb75906302b77b225069bf227 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
@@ -803,15 +803,20 @@ public final class YangParserListenerImpl extends YangParserBaseListener {
         }
 
         QName qname = null;
-        if (!Strings.isNullOrEmpty(nodeParameter)) {
-            String[] splittedName = nodeParameter.split(":");
-            if (splittedName.length == 2) {
-                qname = new QName(null, null, splittedName[0], splittedName[1]);
+        try {
+            if (!Strings.isNullOrEmpty(nodeParameter)) {
+                String[] splittedName = nodeParameter.split(":");
+                if (splittedName.length == 2) {
+                    qname = new QName(null, null, splittedName[0], splittedName[1]);
+                } else {
+                    qname = new QName(namespace, revision, yangModelPrefix, splittedName[0]);
+                }
             } else {
-                qname = new QName(namespace, revision, yangModelPrefix, splittedName[0]);
+                qname = nodeType;
             }
-        } else {
+        } catch (IllegalArgumentException e) {
             qname = nodeType;
+            
         }
         addNodeToPath(qname);
         SchemaPath path = createActualSchemaPath(actualPath.peek());