Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix immutable NormalizedNode equality
[yangtools.git]
/
data
/
yang-data-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
data
/
impl
/
schema
/
builder
/
impl
/
ImmutableUserLeafSetNodeBuilder.java
diff --git
a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java
b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java
index 403722c41965740290197f3f3c4c42f82e23697a..017d822d6ede401c73011cf4226155f246d92d6c 100644
(file)
--- a/
data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java
+++ b/
data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java
@@
-159,7
+159,11
@@
public class ImmutableUserLeafSetNodeBuilder<T> implements ListNodeBuilder<T, Us
@Override
protected boolean valueEquals(final UserLeafSetNode<?> other) {
@Override
protected boolean valueEquals(final UserLeafSetNode<?> other) {
- return children.equals(((ImmutableUserLeafSetNode<?>) other).children);
+ if (other instanceof ImmutableUserLeafSetNode) {
+ return children.equals(((ImmutableUserLeafSetNode<?>) other).children);
+ }
+ // Note: performs a size() check first
+ return Iterables.elementsEqual(children.values(), other.body());
}
private Map<NodeWithValue, LeafSetEntryNode<T>> getChildren() {
}
private Map<NodeWithValue, LeafSetEntryNode<T>> getChildren() {