You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/05/26 11:38:40 UTC
svn commit: r409612 -
/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Author: jukka
Date: Fri May 26 02:38:39 2006
New Revision: 409612
URL: http://svn.apache.org/viewvc?rev=409612&view=rev
Log:
1.0: Merged revision 400051: JCR-426
Modified:
jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Modified: jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=409612&r1=409611&r2=409612&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Fri May 26 02:38:39 2006
@@ -545,9 +545,6 @@
| Event.PROPERTY_CHANGED,
"/", true, null, null, false);
}
-
- // register the observation factory of that workspace
- delegatingDispatcher.addDispatcher(wspInfo.getObservationManagerFactory());
}
/**
@@ -1539,6 +1536,9 @@
obsMgrFactory = new ObservationManagerFactory();
+ // register the observation factory of that workspace
+ delegatingDispatcher.addDispatcher(obsMgrFactory);
+
initialized = true;
log.info("workspace '" + getName() + "' initialized");
@@ -1553,6 +1553,9 @@
}
log.info("shutting down workspace '" + getName() + "'...");
+
+ // deregister the observation factory of that workspace
+ delegatingDispatcher.removeDispatcher(obsMgrFactory);
// dispose observation manager factory
obsMgrFactory.dispose();