Author: mreutegg
Date: Wed Apr 1 15:56:36 2015
New Revision: 1670693
URL: http://svn.apache.org/r1670693
Log:
OAK-2716: Background operation lock not released when DocumentNodeStore is
closed
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1670693&r1=1670692&r2=1670693&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Wed Apr 1 15:56:36 2015
@@ -576,10 +576,10 @@ public final class DocumentNodeStore
base = headRevision;
}
backgroundOperationLock.readLock().lock();
- checkOpen();
boolean success = false;
Commit c;
try {
+ checkOpen();
c = new Commit(this, commitQueue.createRevision(), base, branch);
success = true;
} finally {
@@ -606,10 +606,10 @@ public final class DocumentNodeStore
base = headRevision;
}
backgroundOperationLock.readLock().lock();
- checkOpen();
boolean success = false;
MergeCommit c;
try {
+ checkOpen();
c = new MergeCommit(this, base,
commitQueue.createRevisions(numBranchCommits));
success = true;
} finally {
