#11932 fix bug in case of invalid action + add test

Signed-off-by: Ludovic Orban <[email protected]>

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java

@@ -251,7 +251,6 @@ private void processing()
  boolean notifyCompleteSuccess = false;
  Throwable notifyCompleteFailure = null;
 
- boolean callOnSuccess = false;
  // While we are processing
  processing:
  while (true)
@@ -260,11 +259,6 @@ private void processing()
  Action action = null;
  try
  {
- if (callOnSuccess)
- {
- onSuccess();
- callOnSuccess = false;
- }
  action = process();
  }
  catch (Throwable x)
@@ -273,6 +267,7 @@ private void processing()
  // Fall through to possibly invoke onCompleteFailure().
  }
 
+ boolean callOnSuccess = false;
  // acted on the action we have just received
  try (AutoLock ignored = _lock.lock())
  {
@@ -323,11 +318,11 @@ private void processing()
 
  case CALLED:
  {
+ callOnSuccess = true;
  if (action != Action.SCHEDULED)
  throw new IllegalStateException(String.format("%s[action=%s]", this, action));
  // we lost the race, so we have to keep processing
  _state = State.PROCESSING;
- callOnSuccess = true;
  continue;
  }
 
@@ -346,6 +341,11 @@ private void processing()
  throw new IllegalStateException(String.format("%s[action=%s]", this, action));
  }
  }
+ finally
+ {
+ if (callOnSuccess)
+ onSuccess();
+ }
  }
 
  if (notifyCompleteSuccess)

jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java

@@ -25,6 +25,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class IteratingCallbackTest
@@ -435,4 +436,28 @@ protected void onCompleteFailure(Throwable cause)
 
  assertEquals(1, count.get());
  }
+
+ @Test
+ public void testOnSuccessCalledDespiteISE() throws Exception
+ {
+ CountDownLatch latch = new CountDownLatch(1);
+ IteratingCallback icb = new IteratingCallback()
+ {
+ @Override
+ protected Action process()
+ {
+ succeeded();
+ return Action.IDLE; // illegal action
+ }
+
+ @Override
+ protected void onSuccess()
+ {
+ latch.countDown();
+ }
+ };
+
+ assertThrows(IllegalStateException.class, icb::iterate);
+ assertTrue(latch.await(5, TimeUnit.SECONDS));
+ }
 }