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/07/25 19:56:59 UTC
[03/11] git commit: Handle null locations in LocalLocationManager and
correct JcloudsByonLocationResolver Javadoc
Handle null locations in LocalLocationManager and correct JcloudsByonLocationResolver Javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e7f1291c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e7f1291c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e7f1291c
Branch: refs/heads/master
Commit: e7f1291ca8f2d9d3b024d8c6e695efed92230c34
Parents: 01f70a7
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Jul 22 19:44:57 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Jul 22 19:44:57 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/management/internal/LocalLocationManager.java | 2 +-
.../brooklyn/location/jclouds/JcloudsByonLocationResolver.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e7f1291c/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 d2fb3d7..3038257 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
@@ -122,7 +122,7 @@ public class LocalLocationManager implements LocationManager {
@Override
public boolean isManaged(Location loc) {
- return (isRunning() && getLocation(loc.getId()) != null);
+ return (isRunning() && loc != null && getLocation(loc.getId()) != null);
}
synchronized boolean isPreRegistered(Location loc) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e7f1291c/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java
index 01493e1..bb16c43 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java
@@ -57,9 +57,7 @@ import com.google.common.collect.Sets;
* Examples of valid specs:
* <ul>
* <li>byon:(hosts=myhost)
- * <li>byon:(hosts=myhost,myhost2)
* <li>byon:(hosts="myhost, myhost2")
- * <li>byon:(hosts=myhost,myhost2, name=abc)
* <li>byon:(hosts="myhost, myhost2", name="my location name")
* </ul>
*