jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r996810 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
Date Tue, 14 Sep 2010 09:56:38 GMT
Author: jukka
Date: Tue Sep 14 09:56:38 2010
New Revision: 996810

URL: http://svn.apache.org/viewvc?rev=996810&view=rev
Log:
JCR-2747: ConcurrentModificationException in IndexMerger

Synchronize access to the busyMergers list

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

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java?rev=996810&r1=996809&r2=996810&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
Tue Sep 14 09:56:38 2010
@@ -119,8 +119,10 @@ class IndexMerger implements IndexListen
      */
     void start() {
         isStarted.set(true);
-        for (Worker worker : busyMergers) {
-            worker.unblock();
+        synchronized (busyMergers) {
+            for (Worker worker : busyMergers) {
+                worker.unblock();
+            }
         }
     }
 



Mime
View raw message