From: Martin Sunal <msunal@cisco.com>
Date: Mon, 21 Mar 2016 13:12:21 +0000 (+0100)
Subject: Bug 5567 NPE - invoking of equals on nullable element
X-Git-Tag: release/beryllium-sr2~2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=743bf1fe59701637a9f0de1705b9ba88f349fa78;hp=90378c9ce40d83350802a41e57bbd34bb4d71742;p=yangtools.git

Bug 5567 NPE - invoking of equals on nullable element

Change-Id: I51b757b0bf03f3f2cf5862e3624936f961cd5d87
Signed-off-by: Martin Sunal <msunal@cisco.com>
---

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java
index 5fdf765ab1..f7b1547f74 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java
@@ -79,7 +79,7 @@ class SchemaNodeIdentifierBuildNamespace extends
         Collection<StmtContext<?, ?, ?>> unknownSubstatements = StmtContextUtils.findAllSubstatements(current,
                 UnknownStatement.class);
         for (StmtContext<?, ?, ?> unknownSubstatement : unknownSubstatements) {
-            if(unknownSubstatement.rawStatementArgument().equals(localName)) {
+            if (localName.equals(unknownSubstatement.rawStatementArgument())) {
                 return (Mutable<?, ?, EffectiveStatement<?, ?>>) unknownSubstatement;
             }
         }