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 2016/04/01 16:22:20 UTC
[2/4] brooklyn-server git commit: Entity.getSubscriptionTracker
synchronization
Entity.getSubscriptionTracker synchronization
Avoid calling getSubscriptionContext() while holding lock on
AbstractEntity.this. See discussion in https://github.com/apache/brooklyn-server/pull/96
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/01c67b66
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/01c67b66
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/01c67b66
Branch: refs/heads/master
Commit: 01c67b667d7062804259f9b66e3a18977f7b8fbb
Parents: 24aa5dd
Author: Aled Sage <al...@gmail.com>
Authored: Fri Apr 1 12:32:39 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Apr 1 12:32:39 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/brooklyn/core/entity/AbstractEntity.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/01c67b66/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
index 09834af..58767e4 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
@@ -1492,9 +1492,13 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
}
protected SubscriptionTracker getSubscriptionTracker() {
+ // TODO Would be nice to simplify concurrent model, and not synchronize on
+ // AbstractEntity.this; perhaps could get rid of lazy-initialisation, but then
+ // would need to first ensure `managementSupport` is definitely initialised.
+ SubscriptionContext subscriptionContext = getSubscriptionContext();
synchronized (AbstractEntity.this) {
if (_subscriptionTracker == null) {
- _subscriptionTracker = new SubscriptionTracker(getSubscriptionContext());
+ _subscriptionTracker = new SubscriptionTracker(subscriptionContext);
}
return _subscriptionTracker;
}