Repository: brooklyn-server Updated Branches: refs/heads/master a81471d15 -> d7b8b0cc0
Fix for BROOKLYN-510 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/968a69f6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/968a69f6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/968a69f6 Branch: refs/heads/master Commit: 968a69f6ba4bef85b1f628be69ccf0898445ff9a Parents: 947d5ae Author: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Authored: Tue May 30 17:43:24 2017 +0100 Committer: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Committed: Tue May 30 17:43:24 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/968a69f6/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java index e91b588..0c3a637 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java @@ -47,6 +47,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; import javax.xml.ws.WebServiceException; +import com.google.common.primitives.Ints; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; @@ -936,8 +937,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im } else { LOG.warn("Using DEPRECATED flag OPEN_IPTABLES (will not be supported in future versions) for {} at {}", machineLocation, this); - @SuppressWarnings("unchecked") - Iterable<Integer> inboundPorts = (Iterable<Integer>) setup.get(INBOUND_PORTS); + Iterable<Integer> inboundPorts = Ints.asList(template.getOptions().getInboundPorts()); if (inboundPorts == null || Iterables.isEmpty(inboundPorts)) { LOG.info("No ports to open in iptables (no inbound ports) for {} at {}", machineLocation, this);
