Permalink
Browse files

Merge pull request #118 from shabanovd/develop

I reviewed and tested Dmitriy's proposed changes locally and could not find any unexpected side effects. Concurrency issues are hard to test, so a small risk remains. The previous synchronized effectively locked the entire db though.
  • Loading branch information...
2 parents 8dc2e16 + 42dd536 commit 0fd2f63a1aa5ea5963341519daa74d13acb9811b @wolfgangmm wolfgangmm committed Jan 18, 2014
@@ -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);
Oops, something went wrong.

0 comments on commit 0fd2f63

Please sign in to comment.