diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
index 24cc435..a7c1677 100644
--- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
+++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
@@ -633,7 +633,13 @@ final class DocumentsWriterFlushControl  {
    * checked out DWPT are available
    */
   void waitIfStalled() {
-      stallControl.waitIfStalled();
+    if (documentsWriter.infoStream.isEnabled("DWFC")) {
+      documentsWriter.infoStream.message("DWFC",
+          "waitIfStalled: numFlushesPending: " + flushQueue.size()
+              + " netBytes: " + netBytes() + " flushBytes: " + flushBytes()
+              + " fullFlush: " + fullFlush);
+    }
+    stallControl.waitIfStalled();
   }
 
   /**
diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
index 7b13c30..cfdb218 100644
--- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
+++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
@@ -67,17 +67,16 @@ final class DocumentsWriterStallControl {
   void waitIfStalled() {
     if (stalled) {
       synchronized (this) {
-        boolean hasWaited = false;
-        while (stalled) {
+        if (stalled) { // react on the first wakeup call!
+          // don't loop here, higher level logic will re-stall!
           try {
-            assert hasWaited || incWaiters();
-            assert (hasWaited = true);
+            assert incWaiters();
             wait();
+            assert  decrWaiters();
           } catch (InterruptedException e) {
             throw new ThreadInterruptedException(e);
           }
         }
-        assert !hasWaited || decrWaiters();
       }
     }
   }
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java
index 5c64a26..e24ba4b 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java
@@ -63,7 +63,6 @@ public class TestDocumentsWriterStallControl extends LuceneTestCase {
     
     Thread[] stallThreads = new Thread[atLeast(3)];
     for (int i = 0; i < stallThreads.length; i++) {
-      final int threadId = i;
       final int stallProbability = 1 +random().nextInt(10);
       stallThreads[i] = new Thread() {
         public void run() {