Fixed incorrect instanceof in yang-data-operations. 14/10314/3
authorTony Tkacik <ttkacik@cisco.com>
Tue, 26 Aug 2014 14:35:19 +0000 (16:35 +0200)
committerRobert Varga <rovarga@cisco.com>
Tue, 26 Aug 2014 21:45:18 +0000 (21:45 +0000)
Intended check was to check for AugmentationIdentifier,
AugmentationNode was incorrectly checked.

Change-Id: Ice6f31407c1b8f0bb2400685730324503cd05e44
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ChoiceNodeModification.java

index e281ea73393ef8c6c03636649eda5d6d7c873d49..fdaf0c8f702513899a84586cac99bf2a0a25aabf 100644 (file)
@@ -11,7 +11,6 @@ import java.util.Set;
 
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
@@ -72,7 +71,7 @@ final class ChoiceNodeModification extends
         Set<YangInstanceIdentifier.PathArgument> childrenToProcessFiltered = Sets.newLinkedHashSet();
         for (YangInstanceIdentifier.PathArgument childToProcess : childrenToProcess) {
             // child from other cases, skip
         Set<YangInstanceIdentifier.PathArgument> childrenToProcessFiltered = Sets.newLinkedHashSet();
         for (YangInstanceIdentifier.PathArgument childToProcess : childrenToProcess) {
             // child from other cases, skip
-            if (childToProcess instanceof AugmentationNode
+            if (childToProcess instanceof YangInstanceIdentifier.AugmentationIdentifier
                     && SchemaUtils.belongsToCaseAugment(detectedCase,
                             (YangInstanceIdentifier.AugmentationIdentifier) childToProcess) == false) {
                 continue;
                     && SchemaUtils.belongsToCaseAugment(detectedCase,
                             (YangInstanceIdentifier.AugmentationIdentifier) childToProcess) == false) {
                 continue;