Author: chetanm
Date: Thu Sep 21 08:49:19 2017
New Revision: 1809131
URL: http://svn.apache.org/viewvc?rev=1809131&view=rev
Log:
OAK-6693 - Ensure that IndexNodeManager releases lock in case of error in
acquiring it
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java?rev=1809131&r1=1809130&r2=1809131&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java
Thu Sep 21 08:49:19 2017
@@ -141,8 +141,9 @@ public class IndexNodeManager {
boolean success = false;
try {
refreshPolicy.refreshOnReadIfRequired(refreshCallback);
+ IndexNode indexNode = new IndexNodeImpl(searcherHolder);
success = true;
- return new IndexNodeImpl(searcherHolder);
+ return indexNode;
} finally {
if (!success) {
lock.readLock().unlock();