HSEARCH-4983 Fix lock bypass in IndexWriterProvider

hibernate · Sep 29, 2023 · a8823c5 · a8823c5
1 parent 71777e4
commit a8823c5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/...in/java/org/hibernate/search/backend/lucene/lowlevel/writer/impl/IndexWriterProvider.java b/...in/java/org/hibernate/search/backend/lucene/lowlevel/writer/impl/IndexWriterProvider.java
@@ -71,9 +71,15 @@ public IndexWriterProvider(String indexName, EventContext eventContext,
 	 * Should be used when stopping the index.
 	 */
 	public void clear() throws IOException {
-		IndexWriterDelegatorImpl indexWriterDelegator = currentWriter.getAndSet( null );
-		if ( indexWriterDelegator != null ) {
-			indexWriterDelegator.close();
+		currentWriterModificationLock.lock();
+		try {
+			IndexWriterDelegatorImpl indexWriterDelegator = currentWriter.getAndSet( null );
+			if ( indexWriterDelegator != null ) {
+				indexWriterDelegator.close();
+			}
+		}
+		finally {
+			currentWriterModificationLock.unlock();
 		}
 	}