Do not perform duplicate null checks.
Change-Id: If1fa8631e9e6d93fa2063bea0c395d3fdcba87ea
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
8ac02d36bb5189e29514d837600f45e8eb546d36)
final QName qname = name.getNodeType();
if (parent instanceof DataNodeContainer) {
schema = ((DataNodeContainer)parent).getDataChildByName(qname);
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.");
}
}
} 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;
}
Preconditions.checkArgument(schema != null, "Could not find schema for node %s in %s", qname, parent);
return schema;
}