Repository: stratos
Updated Branches:
  refs/heads/master 17ed0b5ae -> f3736f360


http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationInactivatedMessageProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationInactivatedMessageProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationInactivatedMessageProcessor.java
index 5ec922a..48ecb8b 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationInactivatedMessageProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationInactivatedMessageProcessor.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.ApplicationStatus;
 import org.apache.stratos.messaging.domain.applications.Applications;
-import 
org.apache.stratos.messaging.domain.instance.context.ApplicationInstanceContext;
+import org.apache.stratos.messaging.domain.instance.ApplicationInstance;
 import 
org.apache.stratos.messaging.event.applications.ApplicationInactivatedEvent;
 import org.apache.stratos.messaging.message.processor.MessageProcessor;
 import 
org.apache.stratos.messaging.message.processor.applications.updater.ApplicationsUpdater;
@@ -89,7 +89,7 @@ public class ApplicationInactivatedMessageProcessor extends 
MessageProcessor {
             return false;
         } else {
             // Apply changes to the applications
-            ApplicationInstanceContext context = 
application.getInstanceContexts(event.getInstanceId());
+            ApplicationInstance context = 
application.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 if (log.isWarnEnabled()) {
                     log.warn(String.format("Application Instance not exists in 
Group: [AppId] %s" +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatingMessageProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatingMessageProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatingMessageProcessor.java
index 2e33723..e6cdd2b 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatingMessageProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatingMessageProcessor.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.ApplicationStatus;
 import org.apache.stratos.messaging.domain.applications.Applications;
-import 
org.apache.stratos.messaging.domain.instance.context.ApplicationInstanceContext;
+import org.apache.stratos.messaging.domain.instance.ApplicationInstance;
 import 
org.apache.stratos.messaging.event.applications.ApplicationTerminatingEvent;
 import org.apache.stratos.messaging.message.processor.MessageProcessor;
 import 
org.apache.stratos.messaging.message.processor.applications.updater.ApplicationsUpdater;
@@ -89,7 +89,7 @@ public class ApplicationTerminatingMessageProcessor extends 
MessageProcessor {
             return false;
         } else {
             // Apply changes to the applications
-            ApplicationInstanceContext context = 
application.getInstanceContexts(event.getInstanceId());
+            ApplicationInstance context = 
application.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 if (log.isWarnEnabled()) {
                     log.warn(String.format("Application Instance not exists in 
Group: [AppId] %s" +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupActivatedProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupActivatedProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupActivatedProcessor.java
index 79d6f6c..f37a7f4 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupActivatedProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupActivatedProcessor.java
@@ -24,7 +24,7 @@ import 
org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.Applications;
 import org.apache.stratos.messaging.domain.applications.Group;
 import org.apache.stratos.messaging.domain.applications.GroupStatus;
-import 
org.apache.stratos.messaging.domain.instance.context.GroupInstanceContext;
+import org.apache.stratos.messaging.domain.instance.GroupInstance;
 import org.apache.stratos.messaging.event.applications.GroupActivatedEvent;
 import org.apache.stratos.messaging.message.processor.MessageProcessor;
 import 
org.apache.stratos.messaging.message.processor.applications.updater.ApplicationsUpdater;
@@ -94,7 +94,7 @@ public class GroupActivatedProcessor extends MessageProcessor 
{
                 return false;
             }
         } else {
-            GroupInstanceContext context = 
group.getInstanceContexts(event.getInstanceId());
+            GroupInstance context = 
group.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 if (log.isWarnEnabled()) {
                     log.warn(String.format("Group Instance not exists in 
Group: [AppId] %s [groupId] %s " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInActivateProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInActivateProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInActivateProcessor.java
index 223acc0..41a2881 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInActivateProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInActivateProcessor.java
@@ -24,7 +24,7 @@ import 
org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.Applications;
 import org.apache.stratos.messaging.domain.applications.Group;
 import org.apache.stratos.messaging.domain.applications.GroupStatus;
-import 
org.apache.stratos.messaging.domain.instance.context.GroupInstanceContext;
+import org.apache.stratos.messaging.domain.instance.GroupInstance;
 import org.apache.stratos.messaging.event.applications.GroupInactivatedEvent;
 import org.apache.stratos.messaging.message.processor.MessageProcessor;
 import 
org.apache.stratos.messaging.message.processor.applications.updater.ApplicationsUpdater;
@@ -94,7 +94,7 @@ public class GroupInActivateProcessor extends 
MessageProcessor {
                 return false;
             }
         } else {
-            GroupInstanceContext context = 
group.getInstanceContexts(event.getInstanceId());
+            GroupInstance context = 
group.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 if (log.isWarnEnabled()) {
                     log.warn(String.format("Group Instance not exists in 
Group: [AppId] %s [groupId] %s " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupResetProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupResetProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupResetProcessor.java
index 90bb98c..f999ff3 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupResetProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupResetProcessor.java
@@ -24,7 +24,7 @@ import 
org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.Applications;
 import org.apache.stratos.messaging.domain.applications.Group;
 import org.apache.stratos.messaging.domain.applications.GroupStatus;
-import 
org.apache.stratos.messaging.domain.instance.context.GroupInstanceContext;
+import org.apache.stratos.messaging.domain.instance.GroupInstance;
 import org.apache.stratos.messaging.event.applications.GroupResetEvent;
 import org.apache.stratos.messaging.message.processor.MessageProcessor;
 import 
org.apache.stratos.messaging.message.processor.applications.updater.ApplicationsUpdater;
@@ -95,7 +95,7 @@ public class GroupResetProcessor extends MessageProcessor {
             }
         } else {
             // Apply changes to the applications
-            GroupInstanceContext context = 
group.getInstanceContexts(event.getInstanceId());
+            GroupInstance context = 
group.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 if (log.isWarnEnabled()) {
                     log.warn(String.format("Group Instance not exists in 
Group: [AppId] %s [groupId] %s " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatedProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatedProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatedProcessor.java
index 1ea6394..d263174 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatedProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatedProcessor.java
@@ -24,7 +24,7 @@ import 
org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.Applications;
 import org.apache.stratos.messaging.domain.applications.Group;
 import org.apache.stratos.messaging.domain.applications.GroupStatus;
-import 
org.apache.stratos.messaging.domain.instance.context.GroupInstanceContext;
+import org.apache.stratos.messaging.domain.instance.GroupInstance;
 import org.apache.stratos.messaging.event.applications.GroupTerminatedEvent;
 import org.apache.stratos.messaging.message.processor.MessageProcessor;
 import 
org.apache.stratos.messaging.message.processor.applications.updater.ApplicationsUpdater;
@@ -94,7 +94,7 @@ public class GroupTerminatedProcessor extends 
MessageProcessor {
                 return false;
             }
         } else {
-            GroupInstanceContext context = 
group.getInstanceContexts(event.getInstanceId());
+            GroupInstance context = 
group.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 if (log.isWarnEnabled()) {
                     log.warn(String.format("Group Instance not exists in 
Group: [AppId] %s [groupId] %s " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatingProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatingProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatingProcessor.java
index a227440..69df56b 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatingProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupTerminatingProcessor.java
@@ -24,7 +24,7 @@ import 
org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.Applications;
 import org.apache.stratos.messaging.domain.applications.Group;
 import org.apache.stratos.messaging.domain.applications.GroupStatus;
-import 
org.apache.stratos.messaging.domain.instance.context.GroupInstanceContext;
+import org.apache.stratos.messaging.domain.instance.GroupInstance;
 import org.apache.stratos.messaging.event.applications.GroupTerminatingEvent;
 import org.apache.stratos.messaging.message.processor.MessageProcessor;
 import 
org.apache.stratos.messaging.message.processor.applications.updater.ApplicationsUpdater;
@@ -95,7 +95,7 @@ public class GroupTerminatingProcessor extends 
MessageProcessor {
             }
         } else {
             // Apply changes to the applications
-            GroupInstanceContext context = 
group.getInstanceContexts(event.getInstanceId());
+            GroupInstance context = 
group.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 if (log.isWarnEnabled()) {
                     log.warn(String.format("Group Instance not exists in 
Group: [AppId] %s [groupId] %s " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java
index 21fbf6b..56f98cc 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java
@@ -20,7 +20,7 @@ package 
org.apache.stratos.messaging.message.processor.topology;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import 
org.apache.stratos.messaging.domain.instance.context.ClusterInstanceContext;
+import org.apache.stratos.messaging.domain.instance.ClusterInstance;
 import org.apache.stratos.messaging.domain.topology.Cluster;
 import org.apache.stratos.messaging.domain.topology.ClusterStatus;
 import org.apache.stratos.messaging.domain.topology.Service;
@@ -120,7 +120,7 @@ public class ClusterActivatedProcessor extends 
MessageProcessor {
             }
         } else {
             // Apply changes to the topology
-            ClusterInstanceContext context = 
cluster.getInstanceContexts(event.getInstanceId());
+            ClusterInstance context = 
cluster.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 log.warn("Cluster Instance Context is not found for [cluster] 
" +
                         event.getClusterId() + " [instance-id] " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java
index c455c9b..01dfe0c 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java
@@ -20,7 +20,7 @@ package 
org.apache.stratos.messaging.message.processor.topology;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import 
org.apache.stratos.messaging.domain.instance.context.ClusterInstanceContext;
+import org.apache.stratos.messaging.domain.instance.ClusterInstance;
 import org.apache.stratos.messaging.domain.topology.Cluster;
 import org.apache.stratos.messaging.domain.topology.ClusterStatus;
 import org.apache.stratos.messaging.domain.topology.Service;
@@ -118,7 +118,7 @@ public class ClusterInActivateProcessor extends 
MessageProcessor {
             }
         } else {
             // Apply changes to the topology
-            ClusterInstanceContext context = 
cluster.getInstanceContexts(event.getInstanceId());
+            ClusterInstance context = 
cluster.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 log.warn("Cluster Instance Context is not found for [cluster] 
" +
                         event.getClusterId() + " [instance-id] " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java
index a721f5e..cb195c5 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java
@@ -20,13 +20,11 @@ package 
org.apache.stratos.messaging.message.processor.topology;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import 
org.apache.stratos.messaging.domain.instance.context.ClusterInstanceContext;
+import org.apache.stratos.messaging.domain.instance.ClusterInstance;
 import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.domain.topology.ClusterStatus;
 import org.apache.stratos.messaging.domain.topology.Service;
 import org.apache.stratos.messaging.domain.topology.Topology;
 import org.apache.stratos.messaging.event.topology.ClusterInstanceCreatedEvent;
-import org.apache.stratos.messaging.event.topology.ClusterResetEvent;
 import 
org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter;
 import 
org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter;
 import org.apache.stratos.messaging.message.processor.MessageProcessor;
@@ -117,7 +115,7 @@ public class ClusterInstanceCreatedMessageProcessor extends 
MessageProcessor {
             }
         } else {
             // Apply changes to the topology
-            ClusterInstanceContext context = new 
ClusterInstanceContext(event.getAlias(),
+            ClusterInstance context = new ClusterInstance(event.getAlias(),
                                                                         
event.getClusterId(),
                                                                         
event.getInstanceId());
             //context.setStatus(ClusterStatus.Created);

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java
index 3f8c44d..73f89b7 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java
@@ -20,7 +20,7 @@ package 
org.apache.stratos.messaging.message.processor.topology;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import 
org.apache.stratos.messaging.domain.instance.context.ClusterInstanceContext;
+import org.apache.stratos.messaging.domain.instance.ClusterInstance;
 import org.apache.stratos.messaging.domain.topology.Cluster;
 import org.apache.stratos.messaging.domain.topology.ClusterStatus;
 import org.apache.stratos.messaging.domain.topology.Service;
@@ -116,7 +116,7 @@ public class ClusterResetMessageProcessor extends 
MessageProcessor {
             }
         } else {
             // Apply changes to the topology
-            ClusterInstanceContext context = 
cluster.getInstanceContexts(event.getInstanceId());
+            ClusterInstance context = 
cluster.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 log.warn("Cluster Instance Context is not found for [cluster] 
" +
                         event.getClusterId() + " [instance-id] " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatedProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatedProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatedProcessor.java
index 78f5419..f80f742 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatedProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatedProcessor.java
@@ -20,7 +20,7 @@ package 
org.apache.stratos.messaging.message.processor.topology;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import 
org.apache.stratos.messaging.domain.instance.context.ClusterInstanceContext;
+import org.apache.stratos.messaging.domain.instance.ClusterInstance;
 import org.apache.stratos.messaging.domain.topology.Cluster;
 import org.apache.stratos.messaging.domain.topology.ClusterStatus;
 import org.apache.stratos.messaging.domain.topology.Service;
@@ -119,7 +119,7 @@ public class ClusterTerminatedProcessor extends 
MessageProcessor {
             }
         } else {
             // Apply changes to the topology
-            ClusterInstanceContext context = 
cluster.getInstanceContexts(event.getInstanceId());
+            ClusterInstance context = 
cluster.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 log.warn("Cluster Instance Context is not found for [cluster] 
" +
                         event.getClusterId() + " [instance-id] " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f3736f36/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatingProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatingProcessor.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatingProcessor.java
index 191ef48..5d23678 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatingProcessor.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterTerminatingProcessor.java
@@ -20,7 +20,7 @@ package 
org.apache.stratos.messaging.message.processor.topology;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import 
org.apache.stratos.messaging.domain.instance.context.ClusterInstanceContext;
+import org.apache.stratos.messaging.domain.instance.ClusterInstance;
 import org.apache.stratos.messaging.domain.topology.Cluster;
 import org.apache.stratos.messaging.domain.topology.ClusterStatus;
 import org.apache.stratos.messaging.domain.topology.Service;
@@ -119,7 +119,7 @@ public class ClusterTerminatingProcessor extends 
MessageProcessor {
             }
         } else {
             // Apply changes to the topology
-            ClusterInstanceContext context = 
cluster.getInstanceContexts(event.getInstanceId());
+            ClusterInstance context = 
cluster.getInstanceContexts(event.getInstanceId());
             if(context == null) {
                 log.warn("Cluster Instance Context is not found for [cluster] 
" +
                         event.getClusterId() + " [instance-id] " +

Reply via email to