From 98800205ef1f540f8a76a527be30bb160b32c540 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Wed, 22 May 2013 10:14:47 +0200 Subject: [PATCH] Refactored equals in AugmentationSchemaImpl. Change-Id: Ib683418a3e2547845a71b721aea1090c2cf1ba40 Signed-off-by: Martin Vitez --- .../builder/impl/AugmentationSchemaBuilderImpl.java | 9 +++++++++ .../controller/yang/parser/impl/YangParserTest.java | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java index 29c38dfa0e..605ca6dcf4 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java @@ -350,6 +350,8 @@ public class AugmentationSchemaBuilderImpl implements AugmentationSchemaBuilder + ((targetPath == null) ? 0 : targetPath.hashCode()); result = prime * result + ((whenCondition == null) ? 0 : whenCondition.hashCode()); + result = prime * result + + ((childNodes == null) ? 0 : childNodes.hashCode()); return result; } @@ -379,6 +381,13 @@ public class AugmentationSchemaBuilderImpl implements AugmentationSchemaBuilder } else if (!whenCondition.equals(other.whenCondition)) { return false; } + if (childNodes == null) { + if (other.childNodes != null) { + return false; + } + } else if (!childNodes.equals(other.childNodes)) { + return false; + } return true; } diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserTest.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserTest.java index f6240c9a3f..9cbf5b9719 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserTest.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserTest.java @@ -248,10 +248,7 @@ public class YangParserTest { // check assertEquals(augmentedContainer, augmentedContainerDefinition); - assertEquals(augmentedContainerAugments.iterator().next(), augment1); - assertEquals(augmentedLeaf, augmentedLeafDefinition); - assertEquals(ifEntryAugments.iterator().next(), augment3); } @Test -- 2.36.6