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/22 16:20:43 UTC
[1/2] stratos git commit: fixing member cluster instance id issue
Repository: stratos
Updated Branches:
refs/heads/master 504e99bf2 -> e08091cf7
fixing member cluster instance id issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2da6527f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2da6527f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2da6527f
Branch: refs/heads/master
Commit: 2da6527f556ed2d0bb796ab81e6c3e5c8b7f2766
Parents: 7d5f0bb
Author: reka <rt...@gmail.com>
Authored: Mon Dec 22 20:46:44 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Dec 22 20:46:44 2014 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/iaases/mock/MockMember.java | 3 ++-
.../event/instance/notifier/InstanceCleanupClusterEvent.java | 8 ++++----
.../InstanceCleanupClusterNotifierMessageProcessor.java | 3 ++-
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2da6527f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMember.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMember.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMember.java
index bae22da..87e14ee 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMember.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMember.java
@@ -89,7 +89,8 @@ public class MockMember implements Runnable, Serializable {
protected void onEvent(Event event) {
InstanceCleanupClusterEvent instanceCleanupClusterEvent = (InstanceCleanupClusterEvent) event;
if (mockMemberContext.getClusterId().equals(instanceCleanupClusterEvent.getClusterId()) &&
- mockMemberContext.getInstanceId().equals(instanceCleanupClusterEvent.getInstanceId())) {
+ mockMemberContext.getClusterInstanceId().equals(
+ instanceCleanupClusterEvent.getClusterInstanceId())) {
handleMemberTermination();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/2da6527f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/InstanceCleanupClusterEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/InstanceCleanupClusterEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/InstanceCleanupClusterEvent.java
index 96f42ce..36944f2 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/InstanceCleanupClusterEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/InstanceCleanupClusterEvent.java
@@ -27,18 +27,18 @@ import java.io.Serializable;
*/
public class InstanceCleanupClusterEvent extends InstanceNotifierEvent implements Serializable {
private String clusterId;
- private String instanceId;
+ private String clusterInstanceId;
public InstanceCleanupClusterEvent(String clusterId, String instanceId) {
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = instanceId;
}
public String getClusterId() {
return clusterId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/2da6527f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java
index f513663..921a4d3 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceCleanupClusterNotifierMessageProcessor.java
@@ -37,7 +37,8 @@ public class InstanceCleanupClusterNotifierMessageProcessor extends MessageProce
public boolean process(String type, String message, Object object) {
if (InstanceCleanupClusterEvent.class.getName().equals(type)) {
// Parse complete message and build event
- InstanceCleanupClusterEvent event = (InstanceCleanupClusterEvent) Util.jsonToObject(message, InstanceCleanupClusterEvent.class);
+ InstanceCleanupClusterEvent event = (InstanceCleanupClusterEvent) Util.
+ jsonToObject(message, InstanceCleanupClusterEvent.class);
// Notify event listeners
notifyEventListeners(event);
[2/2] stratos git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e08091cf
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e08091cf
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e08091cf
Branch: refs/heads/master
Commit: e08091cf7aa5423826806385fb9ef5aa1b2c73a5
Parents: 2da6527 504e99b
Author: reka <rt...@gmail.com>
Authored: Mon Dec 22 20:50:33 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Dec 22 20:50:33 2014 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/assembly/filter.properties | 2 +-
.../stratos/modules/distribution/src/assembly/filter.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------