Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#11932 refactor H3 message flusher to have ICB succeeded and failed final 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2024-06-25 10:14:16 +02:00
parent 6d0bddc07a
commit 25bbdb5efc
No known key found for this signature in database
GPG Key ID: 3D146A4A1C58367E
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java
View File

@ -75,7 +75,7 @@ public class MessageFlusher extends IteratingCallback
return Action.SCHEDULED;
}
int generated = generator.generate(accumulator, entry.endPoint.getStreamId(), frame, this::failed);
int generated = generator.generate(accumulator, entry.endPoint.getStreamId(), frame, this::onGenerateFailure);
if (generated < 0)
return Action.SCHEDULED;
@ -88,6 +88,20 @@ public class MessageFlusher extends IteratingCallback
return Action.SCHEDULED;
}
private void onGenerateFailure(Throwable cause)
{
if (LOG.isDebugEnabled())
LOG.debug("failed to generate {} on {}", entry, this, cause);
accumulator.release();
entry.callback.failed(cause);
entry = null;
// Continue the iteration.
succeeded();
}
@Override
protected void onSuccess()
{
@ -96,8 +110,11 @@ public class MessageFlusher extends IteratingCallback
accumulator.release();
entry.callback.succeeded();
entry = null;
if (entry != null)
{
entry.callback.succeeded();
entry = null;
}
}
@Override
@ -108,11 +125,11 @@ public class MessageFlusher extends IteratingCallback
accumulator.release();
entry.callback.failed(cause);
entry = null;
// Continue the iteration.
super.succeeded();
if (entry != null)
{
entry.callback.failed(cause);
entry = null;
}
}
@Override

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

@ -356,7 +356,7 @@ public abstract class IteratingCallback implements Callback
* to call {@code super.succeeded()}.
*/
@Override
public void succeeded()
public final void succeeded()
{
boolean process = false;
try (AutoLock ignored = _lock.lock())
@ -409,7 +409,7 @@ public abstract class IteratingCallback implements Callback
* @see #isFailed()
*/
@Override
public void failed(Throwable x)
public final void failed(Throwable x)
{
boolean failure = false;
try (AutoLock ignored = _lock.lock())