Skip to content

Commit 46f5553

Browse files
committed
minor clean up, rename reclaimCache into performingNextRequest
1 parent 70f286c commit 46f5553

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public NettyRequestSender(AsyncHttpClientConfig config,//
8585
public <T> ListenableFuture<T> sendRequest(final Request request,//
8686
final AsyncHandler<T> asyncHandler,//
8787
NettyResponseFuture<T> future,//
88-
boolean reclaimCache) {
88+
boolean performingNextRequest) {
8989

9090
if (isClosed())
9191
throw new IllegalStateException("Closed");
@@ -98,13 +98,13 @@ public <T> ListenableFuture<T> sendRequest(final Request request,//
9898
if (proxyServer != null && (request.getUri().isSecured() || request.getUri().isWebSocket()) && !isConnectDone(request, future))
9999
if (future != null && future.isConnectAllowed())
100100
// 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);
102102
else
103103
// 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);
105105
else
106106
// no CONNECT for sure
107-
return sendRequestWithCertainForceConnect(request, asyncHandler, future, reclaimCache, proxyServer, false);
107+
return sendRequestWithCertainForceConnect(request, asyncHandler, future, performingNextRequest, proxyServer, false);
108108
}
109109

110110
private boolean isConnectDone(Request request, NettyResponseFuture<?> future) {
@@ -122,7 +122,7 @@ private <T> ListenableFuture<T> sendRequestWithCertainForceConnect(//
122122
Request request,//
123123
AsyncHandler<T> asyncHandler,//
124124
NettyResponseFuture<T> future,//
125-
boolean reclaimCache,//
125+
boolean performingNextRequest,//
126126
ProxyServer proxyServer,//
127127
boolean forceConnect) {
128128

@@ -133,7 +133,7 @@ private <T> ListenableFuture<T> sendRequestWithCertainForceConnect(//
133133
if (Channels.isChannelValid(channel))
134134
return sendRequestWithOpenChannel(request, proxyServer, newFuture, asyncHandler, channel);
135135
else
136-
return sendRequestWithNewChannel(request, proxyServer, newFuture, asyncHandler, reclaimCache);
136+
return sendRequestWithNewChannel(request, proxyServer, newFuture, asyncHandler, performingNextRequest);
137137
}
138138

139139
/**
@@ -144,7 +144,7 @@ private <T> ListenableFuture<T> sendRequestThroughSslProxy(//
144144
Request request,//
145145
AsyncHandler<T> asyncHandler,//
146146
NettyResponseFuture<T> future,//
147-
boolean reclaimCache,//
147+
boolean performingNextRequest,//
148148
ProxyServer proxyServer) {
149149

150150
NettyResponseFuture<T> newFuture = null;
@@ -164,7 +164,7 @@ private <T> ListenableFuture<T> sendRequestThroughSslProxy(//
164164
}
165165

166166
newFuture = newNettyRequestAndResponseFuture(request, asyncHandler, future, proxyServer, true);
167-
return sendRequestWithNewChannel(request, proxyServer, newFuture, asyncHandler, reclaimCache);
167+
return sendRequestWithNewChannel(request, proxyServer, newFuture, asyncHandler, performingNextRequest);
168168
}
169169

170170
private <T> NettyResponseFuture<T> newNettyRequestAndResponseFuture(final Request request, final AsyncHandler<T> asyncHandler, NettyResponseFuture<T> originalFuture,
@@ -244,7 +244,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
244244
ProxyServer proxy,//
245245
NettyResponseFuture<T> future,//
246246
AsyncHandler<T> asyncHandler,//
247-
boolean reclaimCache) {
247+
boolean performingNextRequest) {
248248

249249
// some headers are only set when performing the first request
250250
HttpHeaders headers = future.getNettyRequest().getHttpRequest().headers();
@@ -262,7 +262,8 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
262262

263263
Object partitionKey = future.getPartitionKey();
264264

265-
final boolean channelPreempted = !reclaimCache;
265+
// we disable channelPreemption when performing next requests
266+
final boolean channelPreempted = !performingNextRequest;
266267

267268
try {
268269
// Do not throw an exception when we need an extra connection for a

0 commit comments

Comments
 (0)