From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 3 Aug 2017 09:29:44 +0000 (+0200)
Subject: Cleanup SchemaTracker logic
X-Git-Tag: release/nitrogen~17
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8ac02d36bb5189e29514d837600f45e8eb546d36;p=yangtools.git

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 18dbab2b3e..75722e7f68 100644
--- 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;
     }