File tree 1 file changed +11
-2
lines changed
src/main/java/com/ning/http/client/providers/netty/future 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -129,8 +129,11 @@ public boolean cancel(boolean force) {
129
129
if (isCancelled .getAndSet (true ))
130
130
return false ;
131
131
132
- Channels .setDiscard (channel );
133
- Channels .silentlyCloseChannel (channel );
132
+ // cancel could happen before channel was attached
133
+ if (channel != null ) {
134
+ Channels .setDiscard (channel );
135
+ Channels .silentlyCloseChannel (channel );
136
+ }
134
137
135
138
if (!onThrowableCalled .getAndSet (true )) {
136
139
try {
@@ -371,6 +374,12 @@ public void setConnectAllowed(boolean allowConnect) {
371
374
}
372
375
373
376
public void attachChannel (Channel channel , boolean reuseChannel ) {
377
+
378
+ // future could have been cancelled first
379
+ if (isDone ()) {
380
+ Channels .silentlyCloseChannel (channel );
381
+ }
382
+
374
383
this .channel = channel ;
375
384
this .reuseChannel = reuseChannel ;
376
385
}
You can’t perform that action at this time.
0 commit comments