Cleanup SchemaTracker logic

Do not perform duplicate null checks.

Change-Id: If1fa8631e9e6d93fa2063bea0c395d3fdcba87ea
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java
index 18dbab2b3e67892381e85dad6237f4a5b1f11286..75722e7f68c6cfa3443aed94e25f744f90c2947f 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java
@@ -92,19 +92,19 @@ public final class SchemaTracker {
         final QName qname = name.getNodeType();
         if (parent instanceof DataNodeContainer) {
             schema = ((DataNodeContainer)parent).getDataChildByName(qname);
-
-            if (schema == null && parent instanceof GroupingDefinition) {
-                schema = ((GroupingDefinition) parent);
-            }
-
-            if (schema == null && parent instanceof NotificationDefinition) {
-                schema = ((NotificationDefinition) parent);
+            if (schema == null) {
+                if (parent instanceof GroupingDefinition) {
+                    schema = (GroupingDefinition) parent;
+                } else if (parent instanceof NotificationDefinition) {
+                    schema = (NotificationDefinition) parent;
+                }
             }
         } else if (parent instanceof ChoiceSchemaNode) {
             schema = findChildInCases((ChoiceSchemaNode) parent, qname);
         } else {
             throw new IllegalStateException("Unsupported schema type "+ parent.getClass() +" on stack.");
         }
+
         Preconditions.checkArgument(schema != null, "Could not find schema for node %s in %s", qname, parent);
         return schema;
     }