You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2018/09/26 12:51:12 UTC
[2/3] brooklyn-server git commit: respect depth when considering
merging collections
respect depth when considering merging collections
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7e3d1d7a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7e3d1d7a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7e3d1d7a
Branch: refs/heads/master
Commit: 7e3d1d7aa330200d8a5068a394e41b196b0c4666
Parents: e8427f7
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 26 00:20:35 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 26 00:20:35 2018 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/util/collections/CollectionMerger.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7e3d1d7a/utils/common/src/main/java/org/apache/brooklyn/util/collections/CollectionMerger.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/collections/CollectionMerger.java b/utils/common/src/main/java/org/apache/brooklyn/util/collections/CollectionMerger.java
index 8707fb9..22759f6 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/collections/CollectionMerger.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/collections/CollectionMerger.java
@@ -163,6 +163,8 @@ s *
} else if (!(val2.get() instanceof Iterable)) {
// incompatible types; not merging
return conflictResult;
+ } else if (depthRemaining < 1) {
+ return conflictResult;
} else {
Collection<?> iter1 = val1.get() instanceof Collection ? (Collection<?>) val1.get() : MutableList.copyOf((Iterable<?>)val1.get());
return mergeNestedLists.apply(iter1, MutableList.copyOf((Iterable<?>)val2.get()));