HSEARCH-2179 Release the latch in the finally block

hibernate · Mar 12, 2016 · eaed7ad · eaed7ad
1 parent d40070e
commit eaed7ad
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/engine/src/main/java/org/hibernate/search/backend/impl/lucene/SyncWorkProcessor.java b/engine/src/main/java/org/hibernate/search/backend/impl/lucene/SyncWorkProcessor.java
@@ -136,19 +136,23 @@ private class Consumer implements Runnable {
 		@Override
 		public void run() {
 			Iterable<Changeset> changesets;
-			while ( ! stop ) {
-				changesets = transferQueue.drainToDetachedIterable();
-				while ( changesets == null && ! stop ) {
-					// Avoid busy wait
-					parkCurrentThread();
+			try {
+				while ( !stop ) {
 					changesets = transferQueue.drainToDetachedIterable();
+					while ( changesets == null && !stop ) {
+						// Avoid busy wait
+						parkCurrentThread();
+						changesets = transferQueue.drainToDetachedIterable();
+					}
+					if ( changesets != null ) {
+						applyChangesets( changesets );
+					}
 				}
-				if ( changesets != null ) {
-					applyChangesets( changesets );
-				}
+				log.stoppingSyncConsumerThread( indexName );
+			}
+			finally {
+				shutdownLatch.countDown();
 			}
-			log.stoppingSyncConsumerThread( indexName );
-			shutdownLatch.countDown();
 		}
 
 		private void applyChangesets(Iterable<Changeset> changesets) {