Updated Branches:
  refs/heads/events-framework abd768592 -> 1a2822d3b

hanlde case where no EventBus implementation is configured in component
locator config file


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

Branch: refs/heads/events-framework
Commit: 1a2822d3bfbc3b5833ac8a8490264dfc60554020
Parents: c35b016
Author: Murali Reddy <[email protected]>
Authored: Fri Jan 25 18:23:22 2013 +0530
Committer: Murali Reddy <[email protected]>
Committed: Fri Jan 25 18:23:22 2013 +0530

----------------------------------------------------------------------
 .../src/com/cloud/event/ActionEventCallback.java   |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a2822d3/server/src/com/cloud/event/ActionEventCallback.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/event/ActionEventCallback.java 
b/server/src/com/cloud/event/ActionEventCallback.java
index eeec2b4..0ab3c63 100644
--- a/server/src/com/cloud/event/ActionEventCallback.java
+++ b/server/src/com/cloud/event/ActionEventCallback.java
@@ -181,7 +181,9 @@ public class ActionEventCallback implements 
MethodInterceptor, AnnotationInterce
                 Adapters<EventBus> eventBusImpls = 
locator.getAdapters(EventBus.class);
                 if (eventBusImpls != null) {
                     Enumeration<EventBus> eventBusenum = 
eventBusImpls.enumeration();
-                   _eventBus = eventBusenum.nextElement();
+                    if (eventBusenum != null && 
eventBusenum.hasMoreElements()) {
+                        _eventBus = eventBusenum.nextElement();
+                    }
                 }
                 _eventBusLoaded = true;
             }

Reply via email to