brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [5/6] incubator-brooklyn git commit: address minor shutdown cleanup code review comments
Date Thu, 21 Jan 2016 01:23:32 GMT
address minor shutdown cleanup code review comments


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/11a0b8ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/11a0b8ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/11a0b8ae

Branch: refs/heads/master
Commit: 11a0b8ae67af596a9cf09cf2e22683b5aa81a20f
Parents: 88b76b7
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Jan 21 01:19:12 2016 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Jan 21 01:22:22 2016 +0000

----------------------------------------------------------------------
 .../brooklyn/core/mgmt/internal/AbstractManagementContext.java     | 2 +-
 .../apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11a0b8ae/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
index 5d07ed6..da9fcae 100644
--- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
+++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
@@ -372,7 +372,7 @@ public abstract class AbstractManagementContext implements ManagementContextInte
         return configMap;
     }
 
-    private Object locationRegistrySemaphore = new Object();
+    private final Object locationRegistrySemaphore = new Object();
     
     @Override
     public LocationRegistry getLocationRegistry() {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11a0b8ae/brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
b/brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
index 78dde57..fc3bbc4 100644
--- a/brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
+++ b/brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
@@ -67,7 +67,7 @@ public class ServerStoppingShutdownHandler implements ShutdownHandler {
         }).start();
     }
 
-    /** Expect this to be injeted; typically it is not known when this is created, but we
need it to trigger shutdown. */
+    /** Expect this to be injected; typically it is not known when this is created, but we
need it to trigger shutdown. */
     public void setServer(Server server) {
         this.server = server;
     }


Mime
View raw message