brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [26/28] brooklyn-server git commit: address PR comment, move list recompute to after loop
Date Wed, 15 Feb 2017 18:31:19 GMT
address PR comment, move list recompute to after loop


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3529f176
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3529f176
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3529f176

Branch: refs/heads/master
Commit: 3529f176d9db34386a23616d88107f70e137ccb5
Parents: f1d4c59
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Feb 15 18:16:55 2017 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Feb 15 18:16:55 2017 +0000

----------------------------------------------------------------------
 .../java/org/apache/brooklyn/core/objs/BrooklynDynamicType.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3529f176/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynDynamicType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynDynamicType.java b/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynDynamicType.java
index 2b6c08f..d183c2c 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynDynamicType.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynDynamicType.java
@@ -204,8 +204,8 @@ public abstract class BrooklynDynamicType<T extends BrooklynObject,
AbstractT ex
                             configKeysAll.remove(kn, k2);
                     }
                 }
-                kk = Lists.newArrayList(configKeysAll.get(kn));
             }
+            kk = Lists.newArrayList(configKeysAll.get(kn));
             // multiple keys, not overwriting; if their values are the same then we don't
mind
             FieldAndValue<ConfigKey<?>> best = null;
             for (FieldAndValue<ConfigKey<?>> k: kk) {


Mime
View raw message