You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by di...@apache.org on 2015/09/11 11:36:34 UTC
stratos git commit: Fixing the condition when additing kubernetes
port value for mock IaaS
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 0248d2068 -> d1d8d0b62
Fixing the condition when additing kubernetes port value for mock IaaS
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d1d8d0b6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d1d8d0b6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d1d8d0b6
Branch: refs/heads/stratos-4.1.x
Commit: d1d8d0b6255c792bd1e499fbefc1694a1cd80ea5
Parents: 0248d20
Author: Dinithi <di...@wso2.com>
Authored: Fri Sep 11 15:05:57 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Fri Sep 11 15:05:57 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/messaging/topology/TopologyBuilder.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d1d8d0b6/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 26d1bbd..808ff16 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
@@ -48,7 +48,6 @@ import org.apache.stratos.metadata.client.defaults.MetaDataServiceClient;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import java.util.*;
/**
@@ -458,7 +457,7 @@ public class TopologyBuilder {
ClusterContext clusterContext = CloudControllerContext.getInstance().getClusterContext(clusterId);
List<KubernetesService> kubernetesServices = Lists.newArrayList(clusterContext.getKubernetesServices());
- if (kubernetesServices != null) {
+ if (!kubernetesServices.isEmpty()) {
cluster.setKubernetesServices(kubernetesServices);
}
@@ -610,7 +609,7 @@ public class TopologyBuilder {
Collection<KubernetesService> kubernetesServices = clusterContext.getKubernetesServices();
for (PortMapping portMapping : portMappings) {
- if (kubernetesServices != null) {
+ if (!kubernetesServices.isEmpty()) {
portValue = findKubernetesServicePort(clusterId, kubernetesServices, portMapping);
} else {
portValue = portMapping.getPort();