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 2014/11/19 18:48:04 UTC
[09/13] incubator-brooklyn git commit: fix hot proxying seeing old
entities (below the app level)
fix hot proxying seeing old entities (below the app level)
fix bug where newer real entities preRegistered were not being picked up, in favour of older instances, so new data was not being seen at children at hot_proxies
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1964bc0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1964bc0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1964bc0c
Branch: refs/heads/master
Commit: 1964bc0cc92f4fe95f7358af543d876a3f592411
Parents: 07048fc
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 18 17:45:33 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 19 13:53:07 2014 +0000
----------------------------------------------------------------------
.../management/internal/LocalEntityManager.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1964bc0c/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java
index fdb087b..6c45928 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java
@@ -737,13 +737,13 @@ public class LocalEntityManager implements EntityManagerInternal {
}
private Entity toRealEntityOrNull(String id) {
- Entity result = entitiesById.get(id);
- if (result == null) {
+ Entity result;
+ // prefer the preRegistered and preManaged entities, during hot proxying, they should be newer
+ result = preRegisteredEntitiesById.get(id);
+ if (result==null)
result = preManagedEntitiesById.get(id);
- }
- if (result == null) {
- result = preRegisteredEntitiesById.get(id);
- }
+ if (result==null)
+ entitiesById.get(id);
return result;
}