You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2006/05/05 13:37:26 UTC

svn commit: r400051 - /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

Author: tripod
Date: Fri May  5 04:37:24 2006
New Revision: 400051

URL: http://svn.apache.org/viewcvs?rev=400051&view=rev
Log:
JCR-426 WorkspaceInfo.dispose() does not deregister from obs dispatcher

Modified:
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewcvs/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=400051&r1=400050&r2=400051&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Fri May  5 04:37:24 2006
@@ -546,9 +546,6 @@
                     | Event.PROPERTY_CHANGED,
                     "/", true, null, null, false);
         }
-
-        // register the observation factory of that workspace
-        delegatingDispatcher.addDispatcher(wspInfo.getObservationManagerFactory());
     }
 
     /**
@@ -1550,6 +1547,9 @@
 
             obsMgrFactory = new ObservationManagerFactory();
 
+            // register the observation factory of that workspace
+            delegatingDispatcher.addDispatcher(obsMgrFactory);
+
             initialized = true;
 
             log.info("workspace '" + getName() + "' initialized");
@@ -1564,6 +1564,9 @@
             }
 
             log.info("shutting down workspace '" + getName() + "'...");
+
+            // deregister the observation factory of that workspace
+            delegatingDispatcher.removeDispatcher(obsMgrFactory);
 
             // dispose observation manager factory
             obsMgrFactory.dispose();