X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parser%2Fyang-parser-spi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fspi%2FSchemaTreeNamespace.java;h=096ddc79b983b8cc08efc7e78f3bd966539041f4;hb=ed6bfbad4b36b54d288604cb0efb97edd46db6a6;hp=4439c36727b06965ca680d7d66b9e92524d02a1f;hpb=e8049b7d125af0f60c608623683a31d0f366a462;p=yangtools.git

diff --git a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SchemaTreeNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SchemaTreeNamespace.java
index 4439c36727..096ddc79b9 100644
--- a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SchemaTreeNamespace.java
+++ b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SchemaTreeNamespace.java
@@ -7,6 +7,9 @@
  */
 package org.opendaylight.yangtools.yang.parser.spi;
 
+import static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import java.util.Collection;
 import java.util.Iterator;
@@ -14,8 +17,8 @@ import java.util.Map;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.SchemaNodeIdentifier;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement;
@@ -141,9 +144,9 @@ public final class SchemaTreeNamespace<D extends DeclaredStatement<QName>,
     }
 
     private static NamespaceStorageNode globalOrStatementSpecific(final NamespaceStorageNode storage) {
-        NamespaceStorageNode current = storage;
+        NamespaceStorageNode current = requireNonNull(storage);
         while (!isLocalOrGlobal(current.getStorageNodeType())) {
-            current = current.getParentNamespaceStorage();
+            current = verifyNotNull(current.getParentNamespaceStorage());
         }
         return current;
     }