You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/12/19 11:40:39 UTC

[1/2] git commit: Preventing topology event message delegater thread hang if an exception is thrown.

Updated Branches:
  refs/heads/master b6dbaf655 -> 90923d94f


Preventing topology event message delegater thread hang if an exception is thrown.

If an excetion occured, exception is logged and continue work.


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

Branch: refs/heads/master
Commit: f38d156c6b8f22b70cc91dcfb0a1f4e5f34aea7e
Parents: 52d9282
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Dec 19 16:09:05 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 19 16:09:05 2013 -0500

----------------------------------------------------------------------
 .../cloud/controller/topology/TopologyEventMessageDelegator.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f38d156c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java
index 098f7d5..758db81 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventMessageDelegator.java
@@ -59,7 +59,8 @@ public class TopologyEventMessageDelegator implements Runnable {
             } catch (Exception e) {
                 String error = "Failed to retrieve the topology event message.";
             	log.error(error, e);
-            	throw new RuntimeException(error, e);
+            	// Commenting throwing the error. Otherwise thread will not execute if an exception is thrown.
+            	//throw new RuntimeException(error, e);
             }
         }
     }


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos


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

Branch: refs/heads/master
Commit: 90923d94f850fb3b6fc74c65b1c99b89cac71afa
Parents: f38d156 b6dbaf6
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Dec 19 16:10:40 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Dec 19 16:10:40 2013 -0500

----------------------------------------------------------------------
 .../internal/ADCManagementServerComponent.java  |  2 +-
 .../mgt/publisher/ArtifactUpdatePublisher.java  |  2 +-
 .../broker/subscribe/TopicSubscriber.java       | 11 ++-
 .../synchronization/ArtifactUpdatedEvent.java   | 82 ------------------
 .../instance/notifier/ArtifactUpdatedEvent.java | 84 ++++++++++++++++++
 .../notifier/InstanceNotifierEvent.java         | 31 +++++++
 .../notifier/ArtifactUpdateEventListener.java   | 28 ++++++
 .../ArtifactUpdateMessageProcessor.java         | 61 +++++++++++++
 .../InstanceNotifierMessageProcessorChain.java  | 53 ++++++++++++
 .../InstanceNotifierEventMessageDelegator.java  | 91 ++++++++++++++++++++
 .../InstanceNotifierEventMessageListener.java   | 54 ++++++++++++
 .../InstanceNotifierEventMessageQueue.java      | 44 ++++++++++
 .../InstanceNotifierEventMessageReceiver.java   | 77 +++++++++++++++++
 .../tenant/TenantEventMessageListener.java      |  1 -
 .../stratos/messaging/util/Constants.java       |  2 +-
 .../messaging/test/MessageFilterTest.java       | 81 +++++++++++++++++
 16 files changed, 615 insertions(+), 89 deletions(-)
----------------------------------------------------------------------