Skip to content

Commit 63c5141

Browse files
author
Stephane Landelle
committed
idleConnectionTimeout might have been dropped or not set, close AsyncHttpClient#534
1 parent 56b7228 commit 63c5141

File tree

1 file changed

+9
-5
lines changed
  • providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/timeout

1 file changed

+9
-5
lines changed

providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/timeout/TimeoutsHolder.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,20 @@
2121

2222
public class TimeoutsHolder {
2323

24-
private AtomicBoolean cancelled = new AtomicBoolean();
24+
private final AtomicBoolean cancelled = new AtomicBoolean();
2525
public volatile Timeout requestTimeout;
2626
public volatile Timeout idleConnectionTimeout;
2727

2828
public void cancel() {
2929
if (cancelled.compareAndSet(false, true)) {
30-
requestTimeout.cancel();
31-
idleConnectionTimeout.cancel();
32-
requestTimeout = null;
33-
idleConnectionTimeout = null;
30+
if (requestTimeout != null) {
31+
requestTimeout.cancel();
32+
requestTimeout = null;
33+
}
34+
if (idleConnectionTimeout != null) {
35+
idleConnectionTimeout.cancel();
36+
idleConnectionTimeout = null;
37+
}
3438
}
3539
}
3640
}

0 commit comments

Comments
 (0)