Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cleanup

  • Loading branch information...
commit 9b34891b9c55acf66724ae1b3eff9571f8cc019a 1 parent 75fd5be
@shabanovd shabanovd authored
View
6 src/org/exist/collections/Collection.java
@@ -1091,7 +1091,9 @@ public void removeXMLResource(final Txn transaction, final DBBroker broker, fina
// reload the configuration.
useTriggers = false;
final CollectionConfigurationManager confMgr = broker.getBrokerPool().getConfigurationManager();
- confMgr.invalidateAll(getURI());
+ if (confMgr != null) {
+ confMgr.invalidate(getURI());
+ }
}
DocumentTriggersVisitor triggersVisitor = null;
@@ -1415,7 +1417,7 @@ private void storeXMLInternal(final Txn transaction, final DBBroker broker, fina
final CollectionConfigurationManager manager = broker.getBrokerPool().getConfigurationManager();
if(manager != null) {
try {
- manager.invalidateAll(getURI());
+ manager.invalidate(getURI());
manager.loadConfiguration(broker, this);
} catch(final PermissionDeniedException pde) {
throw new EXistException(pde.getMessage(), pde);
View
2  src/org/exist/collections/CollectionConfigurationManager.java
@@ -389,7 +389,7 @@ public Void call() {
*
* @param collectionPath
*/
- protected void invalidate(final XmldbURI collectionPath) {
+ public void invalidate(final XmldbURI collectionPath) {
if (!collectionPath.startsWith(CONFIG_COLLECTION_URI)) {
return;
}
View
5 src/org/exist/storage/NativeBroker.java
@@ -1413,7 +1413,10 @@ public boolean removeCollection(final Txn transaction, Collection collection) th
final String collName = uri.getRawCollectionPath();
// Notify the collection configuration manager
- pool.getConfigurationManager().invalidateAll(uri);
+ final CollectionConfigurationManager manager = pool.getConfigurationManager();
+ if(manager != null) {
+ manager.invalidate(uri);
+ }
if(LOG.isDebugEnabled()) {
LOG.debug("Removing children collections from their parent '" + collName + "'...");
Please sign in to comment.
Something went wrong with that request. Please try again.