brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject git commit: fix NPE in locaton rebinding
Date Fri, 17 Oct 2014 11:45:01 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 223892aa2 -> 4d5f9e038


fix NPE in locaton rebinding


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

Branch: refs/heads/master
Commit: 4d5f9e038baadeb93e108a89cecad1a3764f5430
Parents: 223892a
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Fri Oct 17 12:44:43 2014 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Fri Oct 17 12:44:43 2014 +0100

----------------------------------------------------------------------
 .../java/brooklyn/management/internal/LocalLocationManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d5f9e03/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
index 564e39b..ede4c69 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
@@ -235,7 +235,7 @@ public class LocalLocationManager implements LocationManagerInternal {
                 }
             }
             
-            boolean result = manageNonRecursive(it, null);
+            boolean result = manageNonRecursive(it, mode);
             if (result) {
                 it.setManagementContext(managementContext);
                 if (!mode.isReadOnly()) {


Mime
View raw message