Skip to content

Commit 2a71598

Browse files
author
Stephane Landelle
committed
Some comments
1 parent fbd6554 commit 2a71598

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyChannelHandler.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ public void call() throws Exception {
312312

313313
Request target = nBuilder.setUrl(newUrl).build();
314314
future.setRequest(target);
315-
requestSender.sendRequest(target, future);
315+
// FIXME why not reuse the channel is same host?
316+
requestSender.sendNextRequest(target, future);
316317
return true;
317318
}
318319
} else {
@@ -466,8 +467,8 @@ private void markAsDone(final NettyResponseFuture<?> future, final ChannelHandle
466467
}
467468
}
468469

469-
private boolean applyResponseFiltersAndReplayRequest(ChannelHandlerContext ctx, NettyResponseFuture<?> future, HttpResponseStatus status, HttpResponseHeaders responseHeaders)
470-
throws IOException {
470+
private boolean applyResponseFiltersAndReplayRequest(ChannelHandlerContext ctx, NettyResponseFuture<?> future, HttpResponseStatus status,
471+
HttpResponseHeaders responseHeaders) throws IOException {
471472

472473
AsyncHandler handler = future.getAsyncHandler();
473474
FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(handler).request(future.getRequest()).responseStatus(status).responseHeaders(responseHeaders)
@@ -544,7 +545,7 @@ private boolean handleResponseAndExit(final ChannelHandlerContext ctx, final Net
544545
Callback callback = new Callback(future) {
545546
public void call() throws Exception {
546547
channels.drainChannel(ctx, future);
547-
requestSender.sendRequest(builder.setHeaders(headers).setRealm(nr).build(), future);
548+
requestSender.sendNextRequest(builder.setHeaders(headers).setRealm(nr).build(), future);
548549
}
549550
};
550551

@@ -562,7 +563,7 @@ public void call() throws Exception {
562563
} else if (statusCode == CONTINUE.code()) {
563564
future.getAndSetWriteHeaders(false);
564565
future.getAndSetWriteBody(true);
565-
// FIXME is this necessary
566+
// FIXME why not reuse the channel?
566567
requestSender.writeRequest(ctx.channel(), config, future);
567568
return true;
568569

@@ -589,7 +590,7 @@ public void call() throws Exception {
589590

590591
future.setReuseChannel(true);
591592
future.setConnectAllowed(true);
592-
requestSender.sendRequest(builder.setHeaders(headers).setRealm(newRealm).build(), future);
593+
requestSender.sendNextRequest(builder.setHeaders(headers).setRealm(newRealm).build(), future);
593594
return true;
594595
}
595596

@@ -609,7 +610,7 @@ public void call() throws Exception {
609610
}
610611
future.setReuseChannel(true);
611612
future.setConnectAllowed(false);
612-
requestSender.sendRequest(builder.build(), future);
613+
requestSender.sendNextRequest(builder.build(), future);
613614
return true;
614615

615616
}

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyRequestSender.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public boolean retry(Channel channel, NettyResponseFuture<?> future) {
8888
LOGGER.debug("Trying to recover request {}\n", future.getNettyRequest());
8989

9090
try {
91-
sendRequest(future.getRequest(), future);
91+
sendNextRequest(future.getRequest(), future);
9292
success = true;
9393

9494
} catch (IOException iox) {
@@ -103,9 +103,8 @@ public boolean retry(Channel channel, NettyResponseFuture<?> future) {
103103
return success;
104104
}
105105

106-
// FIXME Netty 3: only called from nextRequest, useCache, asyncConnect and
107-
// reclaimCache always passed as true
108-
public <T> void sendRequest(final Request request, final NettyResponseFuture<T> f) throws IOException {
106+
public <T> void sendNextRequest(final Request request, final NettyResponseFuture<T> f) throws IOException {
107+
// FIXME Why is sendNextRequest always asyncConnect?
109108
sendRequest(request, f.getAsyncHandler(), f, true, true);
110109
}
111110

@@ -494,6 +493,6 @@ public void replayRequest(final NettyResponseFuture<?> future, FilterContext fc,
494493

495494
LOGGER.debug("\n\nReplaying Request {}\n for Future {}\n", newRequest, future);
496495
channels.drainChannel(ctx, future);
497-
sendRequest(newRequest, future);
496+
sendNextRequest(newRequest, future);
498497
}
499498
}

0 commit comments

Comments
 (0)