jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alex...@apache.org
Subject svn commit: r831934 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
Date Mon, 02 Nov 2009 16:01:29 GMT
Author: alexkli
Date: Mon Nov  2 16:01:29 2009
New Revision: 831934

URL: http://svn.apache.org/viewvc?rev=831934&view=rev
Log:
JCR-2380: NPE in ObservationManagerImpl.getRegisteredEventListeners() during shutdown after
broken startup
- explicitly throwing NPE earlier in constructor as it is done for other parameters as well

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java?rev=831934&r1=831933&r2=831934&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
Mon Nov  2 16:01:29 2009
@@ -87,19 +87,22 @@
      *                belongs to.
      * @param itemMgr {@link org.apache.jackrabbit.core.ItemManager} of the passed
      *                <code>Session</code>.
-     * @throws NullPointerException if <code>session</code> or <code>itemMgr</code>
-     *                              is <code>null</code>.
+     * @throws NullPointerException if <code>dispatcher</code>, <code>session</code>
+     *                              or <code>itemMgr</code> is <code>null</code>.
      */
     public ObservationManagerImpl(
             ObservationDispatcher dispatcher, SessionImpl session,
             ItemManager itemMgr, ClusterNode clusterNode) {
+        if (dispatcher == null) {
+            throw new NullPointerException("dispatcher");
+        }
         if (session == null) {
             throw new NullPointerException("session");
         }
         if (itemMgr == null) {
             throw new NullPointerException("itemMgr");
         }
-
+        
         this.dispatcher = dispatcher;
         this.session = session;
         this.itemMgr = itemMgr;



Mime
View raw message