You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2016/06/22 23:44:52 UTC

brooklyn-server git commit: Revert semantics of reinitAll in BrooklynInitialization

Repository: brooklyn-server
Updated Branches:
  refs/heads/master f554e61fe -> 4388cbe58


Revert semantics of reinitAll in BrooklynInitialization


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

Branch: refs/heads/master
Commit: 4388cbe580a57d092b5e99ac3209c2fa9076757f
Parents: f554e61
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Wed Jun 22 16:44:44 2016 -0700
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Wed Jun 22 16:44:44 2016 -0700

----------------------------------------------------------------------
 .../apache/brooklyn/core/internal/BrooklynInitialization.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4388cbe5/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
index c7bc9b7..bcbde05 100644
--- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
+++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
@@ -73,10 +73,9 @@ public class BrooklynInitialization {
 
     @SuppressWarnings("deprecation")
     public synchronized static void reinitAll() {
-        if (done.compareAndSet(true, false)) {
-            org.apache.brooklyn.util.core.BrooklynLanguageExtensions.reinit();
-            initAll();
-        }
+        done.set(false);
+        org.apache.brooklyn.util.core.BrooklynLanguageExtensions.reinit();
+        initAll();
     }
 
 }