@@ -85,7 +85,7 @@ public NettyRequestSender(AsyncHttpClientConfig config,//
85
85
public <T > ListenableFuture <T > sendRequest (final Request request ,//
86
86
final AsyncHandler <T > asyncHandler ,//
87
87
NettyResponseFuture <T > future ,//
88
- boolean reclaimCache ) {
88
+ boolean performingNextRequest ) {
89
89
90
90
if (isClosed ())
91
91
throw new IllegalStateException ("Closed" );
@@ -98,13 +98,13 @@ public <T> ListenableFuture<T> sendRequest(final Request request,//
98
98
if (proxyServer != null && (request .getUri ().isSecured () || request .getUri ().isWebSocket ()) && !isConnectDone (request , future ))
99
99
if (future != null && future .isConnectAllowed ())
100
100
// SSL proxy or websocket: CONNECT for sure
101
- return sendRequestWithCertainForceConnect (request , asyncHandler , future , reclaimCache , proxyServer , true );
101
+ return sendRequestWithCertainForceConnect (request , asyncHandler , future , performingNextRequest , proxyServer , true );
102
102
else
103
103
// CONNECT will depend if we can pool or connection or if we have to open a new one
104
- return sendRequestThroughSslProxy (request , asyncHandler , future , reclaimCache , proxyServer );
104
+ return sendRequestThroughSslProxy (request , asyncHandler , future , performingNextRequest , proxyServer );
105
105
else
106
106
// no CONNECT for sure
107
- return sendRequestWithCertainForceConnect (request , asyncHandler , future , reclaimCache , proxyServer , false );
107
+ return sendRequestWithCertainForceConnect (request , asyncHandler , future , performingNextRequest , proxyServer , false );
108
108
}
109
109
110
110
private boolean isConnectDone (Request request , NettyResponseFuture <?> future ) {
@@ -122,7 +122,7 @@ private <T> ListenableFuture<T> sendRequestWithCertainForceConnect(//
122
122
Request request ,//
123
123
AsyncHandler <T > asyncHandler ,//
124
124
NettyResponseFuture <T > future ,//
125
- boolean reclaimCache ,//
125
+ boolean performingNextRequest ,//
126
126
ProxyServer proxyServer ,//
127
127
boolean forceConnect ) {
128
128
@@ -133,7 +133,7 @@ private <T> ListenableFuture<T> sendRequestWithCertainForceConnect(//
133
133
if (Channels .isChannelValid (channel ))
134
134
return sendRequestWithOpenChannel (request , proxyServer , newFuture , asyncHandler , channel );
135
135
else
136
- return sendRequestWithNewChannel (request , proxyServer , newFuture , asyncHandler , reclaimCache );
136
+ return sendRequestWithNewChannel (request , proxyServer , newFuture , asyncHandler , performingNextRequest );
137
137
}
138
138
139
139
/**
@@ -144,7 +144,7 @@ private <T> ListenableFuture<T> sendRequestThroughSslProxy(//
144
144
Request request ,//
145
145
AsyncHandler <T > asyncHandler ,//
146
146
NettyResponseFuture <T > future ,//
147
- boolean reclaimCache ,//
147
+ boolean performingNextRequest ,//
148
148
ProxyServer proxyServer ) {
149
149
150
150
NettyResponseFuture <T > newFuture = null ;
@@ -164,7 +164,7 @@ private <T> ListenableFuture<T> sendRequestThroughSslProxy(//
164
164
}
165
165
166
166
newFuture = newNettyRequestAndResponseFuture (request , asyncHandler , future , proxyServer , true );
167
- return sendRequestWithNewChannel (request , proxyServer , newFuture , asyncHandler , reclaimCache );
167
+ return sendRequestWithNewChannel (request , proxyServer , newFuture , asyncHandler , performingNextRequest );
168
168
}
169
169
170
170
private <T > NettyResponseFuture <T > newNettyRequestAndResponseFuture (final Request request , final AsyncHandler <T > asyncHandler , NettyResponseFuture <T > originalFuture ,
@@ -244,7 +244,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
244
244
ProxyServer proxy ,//
245
245
NettyResponseFuture <T > future ,//
246
246
AsyncHandler <T > asyncHandler ,//
247
- boolean reclaimCache ) {
247
+ boolean performingNextRequest ) {
248
248
249
249
// some headers are only set when performing the first request
250
250
HttpHeaders headers = future .getNettyRequest ().getHttpRequest ().headers ();
@@ -262,7 +262,8 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
262
262
263
263
Object partitionKey = future .getPartitionKey ();
264
264
265
- final boolean channelPreempted = !reclaimCache ;
265
+ // we disable channelPreemption when performing next requests
266
+ final boolean channelPreempted = !performingNextRequest ;
266
267
267
268
try {
268
269
// Do not throw an exception when we need an extra connection for a
0 commit comments