Repository: stratos Updated Branches: refs/heads/master 0d7ee705a -> b33737357
Minor cleanup on code clarity Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b3373735 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b3373735 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b3373735 Branch: refs/heads/master Commit: b337373572634cae89469664c9fd3f9d21f71c28 Parents: 7bc01c1 Author: Chamila de Alwis <[email protected]> Authored: Wed Apr 1 10:51:25 2015 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Fri Apr 3 15:05:20 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/messaging/topology/TopologyBuilder.java | 1 - .../processor/topology/ClusterInstanceTerminatingProcessor.java | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b3373735/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 62260c1..ee5cee6 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 @@ -1059,7 +1059,6 @@ public class TopologyBuilder { " [instance-id] %s [current-status] %s [status-requested] %s", event.getClusterId(), event.getInstanceId(), context.getStatus(), status)); - return; } } finally { TopologyManager.releaseWriteLock(); http://git-wip-us.apache.org/repos/asf/stratos/blob/b3373735/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java index 0058dff..75b53b1 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java @@ -115,7 +115,10 @@ public class ClusterInstanceTerminatingProcessor extends MessageProcessor { log.warn("Cluster Instance Context is not found for [cluster] " + event.getClusterId() + " [instance-id] " + event.getInstanceId()); + + return false; } + ClusterStatus status = ClusterStatus.Terminating; if (!context.isStateTransitionValid(status)) { log.error("Invalid State Transition from " + context.getStatus() + " to " + status);
