Fix spotbugs issues in yang-parser-spi

[yangtools.git] / parser / yang-parser-spi / src / main / java / org / opendaylight / yangtools / yang / parser / spi / SchemaTreeNamespace.java

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 ea4e1308cef3cb1b71be24deb7ebc33a9c8818e0..096ddc79b983b8cc08efc7e78f3bd966539041f4 100644 (file)
--- 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;
@@ -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;
     }