Throw exception and handle later on service null case in TopologyBuilder

Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7b8f7067
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7b8f7067
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7b8f7067

Branch: refs/heads/stratos-4.1.x
Commit: 7b8f706769ade309329e2c1c147344b918733c89
Parents: 68fa338
Author: Akila Perera <[email protected]>
Authored: Tue Oct 13 03:17:17 2015 +0530
Committer: Akila Perera <[email protected]>
Committed: Tue Oct 13 03:17:17 2015 +0530

----------------------------------------------------------------------
 .../cloud/controller/messaging/topology/TopologyBuilder.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/7b8f7067/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 415b273..d33264d 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
@@ -147,12 +147,11 @@ public class TopologyBuilder {
             for (Cluster cluster : appClusters) {
                 Service service = 
topology.getService(cluster.getServiceName());
                 if (service == null) {
-                    log.error("Service " + cluster.getServiceName()
+                    throw new RuntimeException("Service " + 
cluster.getServiceName()
                             + " not found in Topology, unable to create 
Application cluster");
-                } else {
-                    service.addCluster(cluster);
-                    log.info("Application Cluster " + cluster.getClusterId() + 
" created in CC topology");
                 }
+                service.addCluster(cluster);
+                log.info("Application Cluster " + cluster.getClusterId() + " 
created in CC topology");
             }
             TopologyManager.updateTopology(topology);
         } finally {

Reply via email to