jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r1414629 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
Date Wed, 28 Nov 2012 10:18:31 GMT
Author: mreutegg
Date: Wed Nov 28 10:18:30 2012
New Revision: 1414629

URL: http://svn.apache.org/viewvc?rev=1414629&view=rev
Log:
JCR-3466: NPE in SingletonTokenStream

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java?rev=1414629&r1=1414628&r2=1414629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
Wed Nov 28 10:18:30 2012
@@ -207,14 +207,15 @@ abstract class AbstractIndex {
             });
         }
 
-        try {
-            latch.await();
-        } catch (InterruptedException e) {
-            throw new IOExceptionWithCause(
-                    "Wait for background indexing tasks was interrupted", e);
-        } finally {
-            invalidateSharedReader();
+        for (;;) {
+            try {
+                latch.await();
+                break;
+            } catch (InterruptedException e) {
+                // retry
+            }
         }
+        invalidateSharedReader();
 
         if (!exceptions.isEmpty()) {
             throw new IOExceptionWithCause(



Mime
View raw message