remove requestSessionOutput() calls

Author: arturobernalg

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java

@@ -835,10 +835,6 @@ private void consumeFrame(final RawFrame frame) throws HttpException, IOExceptio
                     stream.activate();
                     streams.resetIfExceedsMaxConcurrentLimit(stream, localConfig.getMaxConcurrentStreams());
                 }
-                if (resetIfExpired(stream, nowNanos)) {
-                    requestSessionOutput();
-                    break;
-                }
                 try {
                     consumeHeaderFrame(frame, stream);
                     if (stream.isOutputReady()) {

httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestAbstractH2StreamMultiplexer.java

@@ -1294,82 +1294,6 @@ void testExpiredStreamResetOnInboundData() throws Exception {
                 ArgumentMatchers.any(ByteBuffer.class), ArgumentMatchers.anyBoolean());
     }
 
-    @Test
-    void testExpiredStreamResetOnInboundHeaders() throws Exception {
-        Mockito.when(protocolIOSession.write(ArgumentMatchers.any(ByteBuffer.class)))
-                .thenAnswer(invocation -> {
-                    final ByteBuffer buffer = invocation.getArgument(0, ByteBuffer.class);
-                    final int remaining = buffer.remaining();
-                    buffer.position(buffer.limit());
-                    return remaining;
-                });
-        Mockito.doNothing().when(protocolIOSession).setEvent(ArgumentMatchers.anyInt());
-        Mockito.doNothing().when(protocolIOSession).clearEvent(ArgumentMatchers.anyInt());
-
-        final H2Config h2Config = H2Config.custom().build();
-        final AbstractH2StreamMultiplexer mux = new H2StreamMultiplexerImpl(
-                protocolIOSession,
-                FRAME_FACTORY,
-                StreamIdGenerator.EVEN,
-                httpProcessor,
-                CharCodingConfig.DEFAULT,
-                h2Config,
-                h2StreamListener,
-                () -> streamHandler);
-
-        // Encode request headers
-        final ByteArrayBuffer headerBuf = new ByteArrayBuffer(200);
-        final HPackEncoder encoder = new HPackEncoder(h2Config.getHeaderTableSize(),
-                CharCodingSupport.createEncoder(CharCodingConfig.DEFAULT));
-        final List<Header> headers = Arrays.asList(
-                new BasicHeader(":method", "POST"),
-                new BasicHeader(":scheme", "http"),
-                new BasicHeader(":path", "/"),
-                new BasicHeader(":authority", "www.example.com"));
-        encoder.encodeHeaders(headerBuf, headers, h2Config.isCompressionEnabled());
-
-        final WritableByteChannelMock writableChannel = new WritableByteChannelMock(1024);
-        final FrameOutputBuffer outBuffer = new FrameOutputBuffer(16 * 1024);
-
-        // Send initial HEADERS (endHeaders=true, endStream=false) to create stream 1
-        final RawFrame headerFrame = FRAME_FACTORY.createHeaders(1,
-                ByteBuffer.wrap(headerBuf.array(), 0, headerBuf.length()), true, false);
-        outBuffer.write(headerFrame, writableChannel);
-        mux.onInput(ByteBuffer.wrap(writableChannel.toByteArray()));
-
-        Mockito.verify(streamHandler).consumeHeader(headersCaptor.capture(), ArgumentMatchers.eq(false));
-        Assertions.assertFalse(headersCaptor.getValue().isEmpty());
-
-        // Retrieve the stream and set a short timeout
-        final Field streamsField = AbstractH2StreamMultiplexer.class.getDeclaredField("streams");
-        streamsField.setAccessible(true);
-        final H2Streams h2Streams = (H2Streams) streamsField.get(mux);
-        final H2Stream stream = h2Streams.lookupValid(1);
-        stream.setTimeout(Timeout.ofMilliseconds(50));
-
-        // Push last activity into the past so the timeout is expired
-        final Field lastActivityField = H2Stream.class.getDeclaredField("lastActivityNanos");
-        lastActivityField.setAccessible(true);
-        lastActivityField.set(stream, System.nanoTime() - TimeUnit.MILLISECONDS.toNanos(100));
-
-        // Send trailing HEADERS (endHeaders=true, endStream=true) for the expired stream
-        writableChannel.reset();
-        final ByteArrayBuffer trailerBuf = new ByteArrayBuffer(64);
-        encoder.encodeHeaders(trailerBuf, Arrays.asList(
-                new BasicHeader("x-checksum", "abc123")), h2Config.isCompressionEnabled());
-        final RawFrame trailerFrame = FRAME_FACTORY.createHeaders(1,
-                ByteBuffer.wrap(trailerBuf.array(), 0, trailerBuf.length()), true, true);
-        outBuffer.write(trailerFrame, writableChannel);
-        mux.onInput(ByteBuffer.wrap(writableChannel.toByteArray()));
-
-        // The handler must receive a timeout failure, not a second header consumption
-        Mockito.verify(streamHandler).failed(exceptionCaptor.capture());
-        Assertions.assertInstanceOf(H2StreamTimeoutException.class, exceptionCaptor.getValue());
-        // consumeHeader was called exactly once (the initial HEADERS), not twice
-        Mockito.verify(streamHandler, Mockito.times(1)).consumeHeader(
-                ArgumentMatchers.anyList(), ArgumentMatchers.anyBoolean());
-    }
-
     @Test
     void testExpiredStreamResetOnInboundContinuation() throws Exception {
         Mockito.when(protocolIOSession.write(ArgumentMatchers.any(ByteBuffer.class)))