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/10/10 14:35:33 UTC
[1/2] git commit: fixing GroupActivatedEvent issue and GroupMonitor
issue upon GroupActivation
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping 7f2cb13c7 -> af433b6f4
fixing GroupActivatedEvent issue and GroupMonitor issue upon GroupActivation
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7a201c29
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7a201c29
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7a201c29
Branch: refs/heads/4.0.0-grouping
Commit: 7a201c29499f6a3ea63716f6efd7a77388bec5ab
Parents: c79f140
Author: reka <rt...@gmail.com>
Authored: Fri Oct 10 18:05:05 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Oct 10 18:05:05 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/application/ApplicationMonitor.java | 2 +-
.../stratos/cloud/controller/topology/TopologyBuilder.java | 2 +-
.../stratos/messaging/domain/topology/ParentComponent.java | 2 +-
.../message/processor/topology/GroupActivatedProcessor.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7a201c29/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
index 2ad2a0e..1505a43 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
@@ -126,7 +126,7 @@ public class ApplicationMonitor extends Monitor {
private GroupMonitor findGroupMonitor(String id, Collection<GroupMonitor> monitors) {
for (GroupMonitor monitor : monitors) {
// check if alias is equal, if so, return
- if (monitor.equals(id)) {
+ if (monitor.getId().equals(id)) {
return monitor;
} else {
// check if this Group has nested sub Groups. If so, traverse them as well
http://git-wip-us.apache.org/repos/asf/stratos/blob/7a201c29/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
index 0913c00..5a90264 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
@@ -773,7 +773,7 @@ public class TopologyBuilder {
return;
}
- Group group = application.getGroup(groupActivatedEvent.getGroupId());
+ Group group = application.getGroupRecursively(groupActivatedEvent.getGroupId());
if (group == null) {
log.warn(String.format("Group %s does not exist",
groupActivatedEvent.getGroupId()));
http://git-wip-us.apache.org/repos/asf/stratos/blob/7a201c29/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
index d76663c..7ce813e 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ParentComponent.java
@@ -104,7 +104,7 @@ public abstract class ParentComponent implements Serializable {
}
} else {
for (Group group : aliasToGroupMap.values()) {
- travereAndCheckRecursively(group.getAliasToGroupMap(), groupAlias);
+ return travereAndCheckRecursively(group.getAliasToGroupMap(), groupAlias);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7a201c29/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java
index ba9554f..230fcf2 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java
@@ -30,7 +30,7 @@ import org.apache.stratos.messaging.util.Util;
* This processor will act upon the Group activation events
*/
public class GroupActivatedProcessor extends MessageProcessor {
- private static final Log log = LogFactory.getLog(ClusterActivatedProcessor.class);
+ private static final Log log = LogFactory.getLog(GroupActivatedProcessor.class);
private MessageProcessor nextProcessor;
@Override
@@ -81,7 +81,7 @@ public class GroupActivatedProcessor extends MessageProcessor {
}
return false;
}
- Group group = application.getGroup(event.getGroupId());
+ Group group = application.getGroupRecursively(event.getGroupId());
if (group == null) {
if (log.isWarnEnabled()) {
[2/2] git commit: Merge branch '4.0.0-grouping' of
https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Posted by re...@apache.org.
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/af433b6f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/af433b6f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/af433b6f
Branch: refs/heads/4.0.0-grouping
Commit: af433b6f424603361d62527d6896bffa7fb87f8d
Parents: 7a201c2 7f2cb13
Author: reka <rt...@gmail.com>
Authored: Fri Oct 10 18:05:23 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Oct 10 18:05:23 2014 +0530
----------------------------------------------------------------------
.../topology/locking/TopologyLockHierarchy.java | 21 ++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------