Fixing null passing instance id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6af14ca0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6af14ca0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6af14ca0 Branch: refs/heads/master Commit: 6af14ca095e84a8bf825c592b25a3555f915c84d Parents: 27909b1 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Dec 4 22:30:11 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Dec 4 22:30:19 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/messaging/topology/TopologyBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6af14ca0/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 a70a5ab..7d71cc2 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 @@ -928,8 +928,8 @@ public class TopologyBuilder { Cluster cluster = topology.getService(event.getServiceName()). getCluster(event.getClusterId()); - if (!cluster.isStateTransitionValid(ClusterStatus.Terminating, null)) { - log.error("Invalid state transfer from " + cluster.getStatus(null) + " to " + + if (!cluster.isStateTransitionValid(ClusterStatus.Terminating, event.getInstanceId())) { + log.error("Invalid state transfer from " + cluster.getStatus(event.getInstanceId()) + " to " + ClusterStatus.Terminating); } ClusterInstance context = cluster.getInstanceContexts(event.getInstanceId());
