You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by fm...@apache.org on 2008/03/13 16:19:30 UTC

svn commit: r636782 - /jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java

Author: fmeschbe
Date: Thu Mar 13 08:19:29 2008
New Revision: 636782

URL: http://svn.apache.org/viewvc?rev=636782&view=rev
Log:
JCR-1454 NullPointerException may be thrown when trying to enumerate observation event listeners
  - check whether listeners are registered at all

Modified:
    jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java

Modified: jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java?rev=636782&r1=636781&r2=636782&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java Thu Mar 13 08:19:29 2008
@@ -100,7 +100,10 @@
 
     /** {@inheritDoc} */
     public EventListenerIterator getRegisteredEventListeners() {
-        return new ArrayEventListenerIterator(poller.getListeners());
+        EventListener[] listeners = (poller != null)
+                ? poller.getListeners()
+                : new EventListener[0];
+        return new ArrayEventListenerIterator(listeners);
     }
 
     //---------- internal ------------------------------------------------------