You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/07 17:49:17 UTC

[2/5] stratos git commit: fixing wrong state trasition validation

fixing wrong state trasition validation


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

Branch: refs/heads/master
Commit: 0b7e94e6488f9e7494e5ecc947d4bb57d6c1200d
Parents: 0be0bd2
Author: reka <rt...@gmail.com>
Authored: Sun Dec 7 16:22:53 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Sun Dec 7 22:10:30 2014 +0530

----------------------------------------------------------------------
 .../event/publisher/ClusterStatusEventPublisher.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/0b7e94e6/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 af3e2eb..ed968c5 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
@@ -143,8 +143,8 @@ public class ClusterStatusEventPublisher {
             if (service != null) {
                 Cluster cluster = service.getCluster(clusterId);
                 ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
-                if (clusterInstance.isStateTransitionValid(ClusterStatus.Active) &&
-                        clusterInstance.getStatus() != ClusterStatus.Active) {
+                if (clusterInstance.isStateTransitionValid(ClusterStatus.Inactive) &&
+                        clusterInstance.getStatus() != ClusterStatus.Inactive) {
                     ClusterStatusClusterInactivateEvent clusterInActivateEvent =
                             new ClusterStatusClusterInactivateEvent(appId, serviceName, clusterId, instanceId);
 
@@ -168,8 +168,8 @@ public class ClusterStatusEventPublisher {
             if (service != null) {
                 Cluster cluster = service.getCluster(clusterId);
                 ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
-                if (clusterInstance.isStateTransitionValid(ClusterStatus.Active) &&
-                        clusterInstance.getStatus() != ClusterStatus.Active) {
+                if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminating) &&
+                        clusterInstance.getStatus() != ClusterStatus.Terminating) {
                     ClusterStatusClusterTerminatingEvent appStatusClusterTerminatingEvent =
                             new ClusterStatusClusterTerminatingEvent(appId, serviceName, clusterId, instanceId);
 
@@ -193,8 +193,8 @@ public class ClusterStatusEventPublisher {
             if (service != null) {
                 Cluster cluster = service.getCluster(clusterId);
                 ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
-                if (clusterInstance.isStateTransitionValid(ClusterStatus.Active) &&
-                        clusterInstance.getStatus() != ClusterStatus.Active) {
+                if (clusterInstance.isStateTransitionValid(ClusterStatus.Terminated) &&
+                        clusterInstance.getStatus() != ClusterStatus.Terminated) {
                     ClusterStatusClusterTerminatedEvent appStatusClusterTerminatedEvent =
                             new ClusterStatusClusterTerminatedEvent(appId, serviceName, clusterId, instanceId);