Skip to content

Commit db30dd0

Browse files
committed
Implement idleTimeout
1 parent a500259 commit db30dd0

3 files changed

Lines changed: 3 additions & 12 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,7 @@ private void initializeStreamTimeouts(final H2Stream stream) {
13761376
if (streamIdleTimeout == null || !streamIdleTimeout.isEnabled()) {
13771377
final Timeout socketTimeout = ioSession.getSocketTimeout();
13781378
if (socketTimeout != null && socketTimeout.isEnabled()) {
1379-
stream.setIdleTimeout(socketTimeout);
1379+
stream.setTimeout(socketTimeout);
13801380
}
13811381
}
13821382
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public State getState() {
9191

9292
@Override
9393
public void setTimeout(final Timeout timeout) {
94-
// not supported
94+
this.idleTimeout = timeout;
9595
}
9696

9797
boolean isReserved() {
@@ -362,10 +362,6 @@ Timeout getIdleTimeout() {
362362
return idleTimeout;
363363
}
364364

365-
void setIdleTimeout(final Timeout idleTimeout) {
366-
this.idleTimeout = idleTimeout;
367-
}
368-
369365
Timeout getLifetimeTimeout() {
370366
return lifetimeTimeout;
371367
}

httpcore5/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.net.StandardSocketOptions;
3333
import java.nio.ByteBuffer;
3434
import java.nio.channels.ByteChannel;
35-
import java.nio.channels.CancelledKeyException;
3635
import java.nio.channels.SelectionKey;
3736
import java.nio.channels.SocketChannel;
3837
import java.util.Deque;
@@ -159,11 +158,7 @@ public SocketAddress getRemoteAddress() {
159158

160159
@Override
161160
public int getEventMask() {
162-
try {
163-
return this.key.interestOps();
164-
} catch (final CancelledKeyException ignore) {
165-
return 0;
166-
}
161+
return this.key.interestOps();
167162
}
168163

169164
@Override

0 commit comments

Comments
 (0)