Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Refactored yang-maven-plugin. Updated tests. Removed backup files."
[controller.git]
/
opendaylight
/
sal
/
yang-prototype
/
code-generator
/
yang-model-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
yang
/
parser
/
builder
/
impl
/
AugmentationSchemaBuilderImpl.java
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 605ca6dcf4509ade3a24cbe7c61aed43a362445a..70079b39aa37a0f7d1bb114f6c22561dc6ed11d1 100644
(file)
--- 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
@@
-190,6
+190,8
@@
public class AugmentationSchemaBuilderImpl implements AugmentationSchemaBuilder
+ ((augmentTargetStr == null) ? 0 : augmentTargetStr.hashCode());
result = prime * result
+ ((whenCondition == null) ? 0 : whenCondition.hashCode());
+ ((augmentTargetStr == null) ? 0 : augmentTargetStr.hashCode());
result = prime * result
+ ((whenCondition == null) ? 0 : whenCondition.hashCode());
+ result = prime * result
+ + ((childNodes == null) ? 0 : childNodes.hashCode());
return result;
}
return result;
}
@@
-219,6
+221,13
@@
public class AugmentationSchemaBuilderImpl implements AugmentationSchemaBuilder
} else if (!whenCondition.equals(other.whenCondition)) {
return false;
}
} 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;
}
return true;
}