Remove unnecessary code for locking code and relevant try - atch block
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/203db9f8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/203db9f8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/203db9f8 Branch: refs/heads/master Commit: 203db9f883454c6a6b8d1a28bf5e804a3f9e5963 Parents: ed853a5 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri May 15 18:29:33 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri May 15 18:41:12 2015 +0530 ---------------------------------------------------------------------- .../publisher/ClusterStatusEventPublisher.java | 46 +++++++++----------- 1 file changed, 20 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/203db9f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java index 6998646..c0ae737 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java @@ -211,37 +211,31 @@ public class ClusterStatusEventPublisher { public static void sendClusterTerminatedEvent(String appId, String serviceName, String clusterId, String instanceId) { - try { - //TopologyManager.acquireReadLockForCluster(serviceName, clusterId); - Service service = TopologyManager.getTopology().getService(serviceName); - if (service != null) { - Cluster cluster = service.getCluster(clusterId); - ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId); - if (clusterInstance == null) { - log.warn(String.format("Cluster instance not found: [instance-id] %s", instanceId)); - return; - } + Service service = TopologyManager.getTopology().getService(serviceName); + if (service != null) { + Cluster cluster = service.getCluster(clusterId); + ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId); + if (clusterInstance == null) { + log.warn(String.format("Cluster instance not found: [instance-id] %s", instanceId)); + return; + } - if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminated)) { - if (clusterInstance.getStatus() != ClusterStatus.Terminated) { - ClusterStatusClusterTerminatedEvent appStatusClusterTerminatedEvent = - new ClusterStatusClusterTerminatedEvent(appId, serviceName, clusterId, instanceId); + if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminated)) { + if (clusterInstance.getStatus() != ClusterStatus.Terminated) { + ClusterStatusClusterTerminatedEvent appStatusClusterTerminatedEvent = + new ClusterStatusClusterTerminatedEvent(appId, serviceName, clusterId, instanceId); - publishEvent(appStatusClusterTerminatedEvent); - } else { - if (log.isDebugEnabled()) { - log.warn("Cluster is already terminated, [cluster] " + clusterId); - } - } + publishEvent(appStatusClusterTerminatedEvent); } else { - log.warn("Terminated is not in the possible state list for [ClusterInstance] " + - clusterInstance.getInstanceId() + " of [cluster] " + - clusterId + " as it is current state is " + clusterInstance.getStatus()); + if (log.isDebugEnabled()) { + log.warn("Cluster is already terminated, [cluster] " + clusterId); + } } + } else { + log.warn("Terminated is not in the possible state list for [ClusterInstance] " + + clusterInstance.getInstanceId() + " of [cluster] " + + clusterId + " as it is current state is " + clusterInstance.getStatus()); } - } finally { - //TopologyManager.releaseReadLockForCluster(serviceName, clusterId); - } }
