You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/09/08 08:53:33 UTC

svn commit: r1807688 - /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java

Author: chetanm
Date: Fri Sep  8 08:53:32 2017
New Revision: 1807688

URL: http://svn.apache.org/viewvc?rev=1807688&view=rev
Log:
OAK-6637 - Release IndexNode lock in finally clause

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=1807688&r1=1807687&r2=1807688&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 Fri Sep  8 08:53:32 2017
@@ -282,9 +282,12 @@ public class IndexNodeManager {
         @Override
         public void release() {
             if (released.compareAndSet(false, true)) {
-                //Decrement on each release
-                decrementSearcherUsageCount(holder.searcher);
-                IndexNodeManager.this.release();
+                try {
+                    //Decrement on each release
+                    decrementSearcherUsageCount(holder.searcher);
+                } finally {
+                    IndexNodeManager.this.release();
+                }
             }
         }