Skip to content

Commit b559bba

Browse files
committed
Fixed merge for #13159.
Signed-off-by: Simone Bordet <[email protected]>
1 parent 3196927 commit b559bba

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Session.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ protected void onGoAway(GoAwayFrame frame)
532532
// The other peer sent us a GOAWAY with the last processed streamId,
533533
// so we must fail the streams that have a bigger streamId.
534534
Predicate<HTTP3Stream> predicate = stream -> stream.isLocal() && stream.getId() > frame.getLastId();
535-
failStreams(predicate, HTTP3ErrorCode.REQUEST_CANCELLED_ERROR.code(), new EofException());
535+
failStreams(predicate, HTTP3ErrorCode.REQUEST_CANCELLED_ERROR.code(), new RetryableStreamException());
536536
}
537537

538538
tryRunZeroStreamsAction();

jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/RetryRequestTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.eclipse.jetty.http3.frames.HeadersFrame;
3030
import org.eclipse.jetty.util.Promise;
3131
import org.eclipse.jetty.util.thread.Invocable;
32-
import org.junit.jupiter.api.Assumptions;
3332
import org.junit.jupiter.params.ParameterizedTest;
3433
import org.junit.jupiter.params.provider.MethodSource;
3534

@@ -44,9 +43,6 @@ public class RetryRequestTest extends AbstractClientServerTest
4443
@MethodSource("transports")
4544
public void testRetryRequest(TransportType transportType) throws Exception
4645
{
47-
// TODO #13131
48-
Assumptions.assumeTrue(transportType != TransportType.H3_QUICHE);
49-
5046
AtomicReference<Session> serverSessionRef = new AtomicReference<>();
5147
start(transportType, new Session.Server.Listener()
5248
{

0 commit comments

Comments
 (0)