Repository: stratos Updated Branches: refs/heads/master c4235bfee -> d583e4864
handling port mapping not defined cases Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d583e486 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d583e486 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d583e486 Branch: refs/heads/master Commit: d583e4864d706750fba838e318d93aa6af7d22f1 Parents: c4235bf Author: reka <[email protected]> Authored: Thu May 21 19:47:33 2015 +0530 Committer: reka <[email protected]> Committed: Thu May 21 19:47:52 2015 +0530 ---------------------------------------------------------------------- .../messaging/publisher/TopologyEventPublisher.java | 12 +++++++----- .../messaging/topology/TopologyBuilder.java | 16 ++++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d583e486/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java index a17876a..47d1682 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java @@ -57,11 +57,13 @@ public class TopologyEventPublisher { : ServiceType.SingleTenant)); // Add ports to the event - Port port; - List<PortMapping> portMappings = Arrays.asList(cartridge.getPortMappings()); - for (PortMapping portMapping : portMappings) { - port = new Port(portMapping.getProtocol(), portMapping.getPort(), portMapping.getProxyPort()); - serviceCreatedEvent.addPort(port); + if(cartridge.getPortMappings() != null) { + Port port; + List<PortMapping> portMappings = Arrays.asList(cartridge.getPortMappings()); + for (PortMapping portMapping : portMappings) { + port = new Port(portMapping.getProtocol(), portMapping.getPort(), portMapping.getProxyPort()); + serviceCreatedEvent.addPort(port); + } } if (log.isInfoEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/d583e486/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java index 0182986..8940ed0 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java @@ -66,7 +66,6 @@ public class TopologyBuilder { if (!topology.serviceExists(cartridge.getType())) { ServiceType serviceType = cartridge.isMultiTenant() ? ServiceType.MultiTenant : ServiceType.SingleTenant; service = new Service(cartridge.getType(), serviceType); - List<PortMapping> portMappings = Arrays.asList(cartridge.getPortMappings()); Properties properties = new Properties(); try { @@ -92,12 +91,17 @@ public class TopologyBuilder { } service.setProperties(properties); - Port port; - //adding ports to the event - for (PortMapping portMapping : portMappings) { - port = new Port(portMapping.getProtocol(), portMapping.getPort(), portMapping.getProxyPort()); - service.addPort(port); + if(cartridge.getPortMappings() != null) { + List<PortMapping> portMappings = Arrays.asList(cartridge.getPortMappings()); + Port port; + //adding ports to the event + for (PortMapping portMapping : portMappings) { + port = new Port(portMapping.getProtocol(), + portMapping.getPort(), portMapping.getProxyPort()); + service.addPort(port); + } } + topology.addService(service); TopologyManager.updateTopology(topology); }
