X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FChoiceBuilder.java;h=f4202343fa757916a5850bc4ad30f24d6e07c762;hb=84929adc0968c0ad916b85ba9cb49d622abd17a7;hp=05095fe93680b6031f735ec5461e4c9dbf8628ad;hpb=61ffc336fddd9f743542986ce5c628154c6e995c;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java index 05095fe936..f4202343fa 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java @@ -394,10 +394,8 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da throw new IllegalArgumentException("Choice Case QName cannot be NULL!"); } for (final ChoiceCaseNode caseNode : cases) { - if (caseNode != null) { - if (name.equals(caseNode.getQName())) { - return caseNode; - } + if (caseNode != null && name.equals(caseNode.getQName())) { + return caseNode; } } return null; @@ -409,10 +407,9 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da throw new IllegalArgumentException("Choice Case string Name cannot be NULL!"); } for (final ChoiceCaseNode caseNode : cases) { - if (caseNode != null && (caseNode.getQName() != null)) { - if (name.equals(caseNode.getQName().getLocalName())) { - return caseNode; - } + if (caseNode != null && (caseNode.getQName() != null) + && name.equals(caseNode.getQName().getLocalName())) { + return caseNode; } } return null;