modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 9192306990e68a5ab44b026874a50566b6b87db5 Author: Heiko W. Rupp hwr@redhat.com Date: Fri May 20 11:56:14 2011 +0200
Prevent NPE on container shutdown.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java index 64a6ff7..b0b37ec 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java @@ -103,7 +103,7 @@ public class EventContextImpl implements EventContext { public SigarProxy getSigar() { return getEventManager().getSigar(); } - + private void registerEventPollerInternal(final EventPoller poller, int pollingInterval, final String sourceLocation) { EventDefinition eventDefinition = EventUtility.getEventDefinition(poller.getEventType(), this.resource.getResourceType()); @@ -124,6 +124,8 @@ public class EventContextImpl implements EventContext { EventDefinition eventDefinition = EventUtility.getEventDefinition(eventType, this.resource.getResourceType()); if (eventDefinition == null) throw new IllegalArgumentException("Unknown event type - no EventDefinition exists with name '" + eventType + "'."); - getEventManager().unregisterEventPoller(this.resource, eventType, sourceLocation); + EventManager eventManager = getEventManager(); + if (eventManager!=null) + eventManager.unregisterEventPoller(this.resource, eventType, sourceLocation); } }
rhq-commits@lists.fedorahosted.org