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 2015/12/21 12:41:39 UTC
[5/5] incubator-brooklyn git commit: tidy-up following review of
#1117, thx @iyovcheva
tidy-up following review of #1117, thx @iyovcheva
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9b7ad2e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9b7ad2e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9b7ad2e3
Branch: refs/heads/master
Commit: 9b7ad2e3c4ebcb6183edc0d30d6adcd1b45f361e
Parents: 885c7c3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 21 11:40:58 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Dec 21 11:41:13 2015 +0000
----------------------------------------------------------------------
.../brooklyn/location/jclouds/JcloudsSshMachineLocation.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b7ad2e3/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
index feaa3f7..cddc98b 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
@@ -342,9 +342,9 @@ public class JcloudsSshMachineLocation extends SshMachineLocation implements Jcl
privateHostname = p;
break;
}
- if (groovyTruth(getPublicAddresses())) {
+ if (Strings.isBlank(privateHostname) && groovyTruth(getPublicAddresses())) {
privateHostname = getPublicAddresses().iterator().next();
- } else {
+ } else if (Strings.isBlank(privateHostname)) {
privateHostname = getHostname();
}
}