Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 57794fc29 -> 62387055a
fixing a bug in CompleteTopologyMessageProcessor Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/62387055 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/62387055 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/62387055 Branch: refs/heads/4.0.0-grouping Commit: 62387055a5d94eb012263812eb03b17b4c5a9d0d Parents: 57794fc Author: Isuru Haththotuwa <[email protected]> Authored: Thu Oct 9 20:46:04 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Oct 9 20:46:04 2014 +0530 ---------------------------------------------------------------------- .../topology/CompleteTopologyMessageProcessor.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/62387055/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java index f0df6eb..6414951 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java @@ -55,15 +55,19 @@ public class CompleteTopologyMessageProcessor extends MessageProcessor { TopologyUpdater.acquireWriteLock(); try { - return topology.isInitialized() || doProcess(event, topology); + if (!topology.isInitialized()) { + doProcess(event, topology); + } } finally { TopologyUpdater.releaseWriteLock(); } - } else { - return true; } + // Notify event listeners + notifyEventListeners(event); + return true; + } else { if (nextProcessor != null) { // ask the next processor to take care of the message. @@ -73,7 +77,7 @@ public class CompleteTopologyMessageProcessor extends MessageProcessor { } } - private boolean doProcess (CompleteTopologyEvent event, Topology topology) { + private void doProcess (CompleteTopologyEvent event, Topology topology) { // Apply service filter if (TopologyServiceFilter.getInstance().isActive()) { @@ -162,9 +166,5 @@ public class CompleteTopologyMessageProcessor extends MessageProcessor { // Set topology initialized topology.setInitialized(true); - - // Notify event listeners - notifyEventListeners(event); - return true; } }
