commit f9b7333477266526eb264e4ff67dd2e79f1214ac
author Aled Sage <aled.sage@gmail.com> Fri Jan 27 12:01:11 2017 +0000
committer Aled Sage <aled.sage@gmail.com> Fri Jan 27 12:01:11 2017 +0000
tree d66dab0ce8bb2f0dc4359d4f4ed091396d406a5a
parent 77ded8ed3cde2b95306825c48cafad88a07f3368
parent 702995d4255f9fca512141dab83b947fd62c217b

This closes #537

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 ab9e225..404f892 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
@@ -364,8 +364,9 @@
         if (privateAddress.isPresent()) {
             return privateAddress.get();
         }
-        if (groovyTruth(node.getPublicAddresses())) {
-            return node.getPublicAddresses().iterator().next();
+        Set<String> publicAddresses = getPublicAddresses();
+        if (groovyTruth(publicAddresses)) {
+            return publicAddresses.iterator().next();
         }
         return null;
     }

locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java

diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
index 7a2fe3d..5d8f02b 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
@@ -26,8 +26,6 @@
 import org.apache.brooklyn.location.winrm.WinRmMachineLocation;
 import org.apache.brooklyn.util.core.flags.SetFromFlag;
 import org.apache.brooklyn.util.net.Networking;
-import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.compute.callables.RunScriptOnNode;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.Template;
@@ -277,8 +275,9 @@
         if (privateAddress.isPresent()) {
             return privateAddress.get();
         }
-        if (groovyTruth(node.getPublicAddresses())) {
-            return node.getPublicAddresses().iterator().next();
+        Set<String> publicAddresses = getPublicAddresses();
+        if (groovyTruth(publicAddresses)) {
+            return publicAddresses.iterator().next();
         }
         return null;
     }