You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2012/01/23 12:33:17 UTC

svn commit: r1234752 - /felix/sandbox/cziegeler/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java

Author: cziegeler
Date: Mon Jan 23 11:33:16 2012
New Revision: 1234752

URL: http://svn.apache.org/viewvc?rev=1234752&view=rev
Log:
Prevent NPE if service is not available

Modified:
    felix/sandbox/cziegeler/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java

Modified: felix/sandbox/cziegeler/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java
URL: http://svn.apache.org/viewvc/felix/sandbox/cziegeler/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java?rev=1234752&r1=1234751&r2=1234752&view=diff
==============================================================================
--- felix/sandbox/cziegeler/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java (original)
+++ felix/sandbox/cziegeler/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java Mon Jan 23 11:33:16 2012
@@ -20,8 +20,13 @@ package org.apache.felix.eventadmin.impl
 
 import org.apache.felix.eventadmin.impl.security.PermissionsUtil;
 import org.apache.felix.eventadmin.impl.util.LogWrapper;
-import org.osgi.framework.*;
-import org.osgi.service.event.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventConstants;
+import org.osgi.service.event.EventHandler;
 
 /**
  * This is a proxy for event handlers. It gets the real event handler
@@ -174,7 +179,10 @@ public class EventHandlerProxy {
                 try
                 {
                     this.handler = (EventHandler)this.handlerContext.bundleContext.getService(this.reference);
-                    this.checkTimeout(this.handler.getClass().getName());
+                    if ( this.handler != null )
+                    {
+                        this.checkTimeout(this.handler.getClass().getName());
+                    }
                 }
                 catch (final IllegalStateException ignore)
                 {