You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/10/02 12:49:53 UTC

[02/10] brooklyn-server git commit: BasicEntityMemento: fix getting config keys

BasicEntityMemento: fix getting config keys


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

Branch: refs/heads/master
Commit: 4ac5db62e83c8423e8929184ce4899b7a89a778f
Parents: 0b3e613
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 26 13:20:41 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Oct 2 06:08:30 2017 +0100

----------------------------------------------------------------------
 .../apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ac5db62/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java
index bb8e133..939ad2d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java
@@ -163,7 +163,7 @@ public class BasicEntityMemento extends AbstractTreeNodeMemento implements Entit
         if (configByKey != null) {
             for (Map.Entry<ConfigKey<?>, Object> entry : configByKey.entrySet()) {
                 ConfigKey<?> key = entry.getKey();
-                if (!configKeys.containsKey(key) && key != staticConfigKeys.get(key.getName())) {
+                if (!configKeys.containsKey(key.getName()) && key != staticConfigKeys.get(key.getName())) {
                     configKeys.put(key.getName(), key);
                 }
                 config.put(key.getName(), entry.getValue());