Skip to content

Commit 126b7e2

Browse files
committed
Re-enable the listener test now that win32 is fixed
1 parent d5a0fb6 commit 126b7e2

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -315,24 +315,14 @@ protected final <T> void writeRequest(final Channel channel,
315315
final NettyResponseFuture<T> future,
316316
final HttpRequest nettyRequest) {
317317
try {
318-
319-
if (TransferCompletionHandler.class.isAssignableFrom(future.getAsyncHandler().getClass())) {
320-
321-
FluentCaseInsensitiveStringsMap h = new FluentCaseInsensitiveStringsMap();
322-
for (String s : future.getNettyRequest().getHeaderNames()) {
323-
for (String header : future.getNettyRequest().getHeaders(s)) {
324-
h.add(s, header);
325-
}
326-
}
327-
328-
TransferCompletionHandler.class.cast(future.getAsyncHandler()).transferAdapter(
329-
new NettyTransferAdapter(h, nettyRequest.getContent(), future.getRequest().getFile()));
330-
}
331-
332318
if (!channel.isOpen() || !channel.isConnected()) {
333319
if (!remotelyClosed(channel, future)) {
334320
abort(future, new ConnectException());
335321
return;
322+
} else {
323+
log.error("Channel is in close state {} and cannot be recovered", channel);
324+
abort(future, new ClosedChannelException());
325+
return;
336326
}
337327
}
338328

@@ -355,6 +345,20 @@ protected final <T> void writeRequest(final Channel channel,
355345
}
356346
}
357347

348+
349+
if (TransferCompletionHandler.class.isAssignableFrom(future.getAsyncHandler().getClass())) {
350+
351+
FluentCaseInsensitiveStringsMap h = new FluentCaseInsensitiveStringsMap();
352+
for (String s : future.getNettyRequest().getHeaderNames()) {
353+
for (String header : future.getNettyRequest().getHeaders(s)) {
354+
h.add(s, header);
355+
}
356+
}
357+
358+
TransferCompletionHandler.class.cast(future.getAsyncHandler()).transferAdapter(
359+
new NettyTransferAdapter(h, nettyRequest.getContent(), future.getRequest().getFile()));
360+
}
361+
358362
// Leave it to true.
359363
if (future.getAndSetWriteHeaders(true)) {
360364
try {
@@ -1463,6 +1467,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e)
14631467
} catch (Throwable t) {
14641468
cause = t;
14651469
}
1470+
14661471
if (future != null) {
14671472
try {
14681473
abort(future, cause);

src/main/java/com/ning/http/client/providers/netty/NettyResponseFuture.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ V getContent() throws ExecutionException {
221221
}
222222

223223
V update = content.get();
224+
// No more retry
225+
currentRetry.set(maxRetry);
224226
if (exEx.get() == null && !contentProcessed.getAndSet(true)) {
225227
try {
226228
update = asyncHandler.onCompleted();

src/test/java/com/ning/http/client/async/TransferListenerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public void onThrowable(Throwable t) {
191191
c.close();
192192
}
193193

194-
@Test(groups = {"standalone", "default_provider"}, enabled = false)
194+
@Test(groups = {"standalone", "default_provider"})
195195
public void basicPutBodyTest() throws Throwable {
196196
AsyncHttpClient c = new AsyncHttpClient();
197197

0 commit comments

Comments
 (0)