Repository: incubator-stratos Updated Branches: refs/heads/master 754148852 -> fbcb4a062
fixing an unnecessary runtime exception Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fbcb4a06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fbcb4a06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fbcb4a06 Branch: refs/heads/master Commit: fbcb4a062e5e67ad263b4665092d6425a31b6bf5 Parents: 7541488 Author: Nirmal Fernando <[email protected]> Authored: Wed Feb 26 11:17:05 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Feb 26 11:17:05 2014 +0530 ---------------------------------------------------------------------- .../controller/topology/TopologyBuilder.java | 35 ++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fbcb4a06/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index 5c9a19e..047940c 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -54,7 +54,7 @@ public class TopologyBuilder { Service service; Topology topology = TopologyManager.getTopology(); if (cartridgeList == null) { - throw new RuntimeException(String.format("Cartridge list is empty")); + log.warn(String.format("Cartridge list is empty")); } try { @@ -97,7 +97,7 @@ public class TopologyBuilder { } TopologyEventPublisher.sendServiceRemovedEvent(cartridgeList); } else { - throw new RuntimeException(String.format("Service %s does not exist..", cartridge.getType())); + log.warn(String.format("Service %s does not exist..", cartridge.getType())); } } else { log.warn("Subscription already exists. Hence not removing the service:" + cartridge.getType() @@ -150,12 +150,12 @@ public class TopologyBuilder { Service service = topology.getService(ctxt.getCartridgeType()); String deploymentPolicy; if (service == null) { - throw new RuntimeException(String.format("Service %s does not exist", + log.warn(String.format("Service %s does not exist", ctxt.getCartridgeType())); } if (!service.clusterExists(ctxt.getClusterId())) { - throw new RuntimeException(String.format("Cluster %s does not exist for service %s", + log.warn(String.format("Cluster %s does not exist for service %s", ctxt.getClusterId(), ctxt.getCartridgeType())); } @@ -179,7 +179,7 @@ public class TopologyBuilder { Cluster cluster = service.getCluster(clusterId); if (cluster.memberExists(memberId)) { - throw new RuntimeException(String.format("Member %s already exists", memberId)); + log.warn(String.format("Member %s already exists", memberId)); } try { @@ -201,11 +201,11 @@ public class TopologyBuilder { Topology topology = TopologyManager.getTopology(); Service service = topology.getService(instanceStartedEvent.getServiceName()); if (service == null) { - throw new RuntimeException(String.format("Service %s does not exist", + log.warn(String.format("Service %s does not exist", instanceStartedEvent.getServiceName())); } if (!service.clusterExists(instanceStartedEvent.getClusterId())) { - throw new RuntimeException(String.format("Cluster %s does not exist in service %s", + log.warn(String.format("Cluster %s does not exist in service %s", instanceStartedEvent.getClusterId(), instanceStartedEvent.getServiceName())); } @@ -213,7 +213,7 @@ public class TopologyBuilder { Member member = service.getCluster(instanceStartedEvent.getClusterId()). getMember(instanceStartedEvent.getMemberId()); if (member == null) { - throw new RuntimeException(String.format("Member %s does not exist", + log.warn(String.format("Member %s does not exist", instanceStartedEvent.getMemberId())); } try { @@ -241,19 +241,19 @@ public class TopologyBuilder { Topology topology = TopologyManager.getTopology(); Service service = topology.getService(instanceActivatedEvent.getServiceName()); if (service == null) { - throw new RuntimeException(String.format("Service %s does not exist", + log.warn(String.format("Service %s does not exist", instanceActivatedEvent.getServiceName())); } Cluster cluster = service.getCluster(instanceActivatedEvent.getClusterId()); if (cluster == null) { - throw new RuntimeException(String.format("Cluster %s does not exist", + log.warn(String.format("Cluster %s does not exist", instanceActivatedEvent.getClusterId())); } Member member = cluster.getMember(instanceActivatedEvent.getMemberId()); if (member == null) { - throw new RuntimeException(String.format("Member %s does not exist", + log.warn(String.format("Member %s does not exist", instanceActivatedEvent.getMemberId())); } @@ -302,18 +302,18 @@ public class TopologyBuilder { Service service = topology.getService(instanceReadyToShutdownEvent.getServiceName()); //update the status of the member if (service == null) { - throw new RuntimeException(String.format("Service %s does not exist", + log.warn(String.format("Service %s does not exist", instanceReadyToShutdownEvent.getServiceName())); } Cluster cluster = service.getCluster(instanceReadyToShutdownEvent.getClusterId()); if (cluster == null) { - throw new RuntimeException(String.format("Cluster %s does not exist", + log.warn(String.format("Cluster %s does not exist", instanceReadyToShutdownEvent.getClusterId())); } Member member = cluster.getMember(instanceReadyToShutdownEvent.getMemberId()); if (member == null) { - throw new RuntimeException(String.format("Member %s does not exist", + log.warn(String.format("Member %s does not exist", instanceReadyToShutdownEvent.getMemberId())); } MemberReadyToShutdownEvent memberReadyToShutdownEvent = new MemberReadyToShutdownEvent( @@ -352,19 +352,20 @@ public class TopologyBuilder { Service service = topology.getService(instanceMaintenanceModeEvent.getServiceName()); //update the status of the member if (service == null) { - throw new RuntimeException(String.format("Service %s does not exist", + log.warn(String.format("Service %s does not exist", instanceMaintenanceModeEvent.getServiceName())); } Cluster cluster = service.getCluster(instanceMaintenanceModeEvent.getClusterId()); if (cluster == null) { - throw new RuntimeException(String.format("Cluster %s does not exist", + log.warn(String.format("Cluster %s does not exist", instanceMaintenanceModeEvent.getClusterId())); } Member member = cluster.getMember(instanceMaintenanceModeEvent.getMemberId()); if (member == null) { - throw new RuntimeException(String.format("Member %s does not exist", + log.warn(String.format("Member %s does not exist", instanceMaintenanceModeEvent.getMemberId())); + return; } MemberMaintenanceModeEvent memberMaintenanceModeEvent = new MemberMaintenanceModeEvent( instanceMaintenanceModeEvent.getServiceName(),
