Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not create close listener handlers for every new request (master) #3859

Merged
merged 1 commit into from
Feb 1, 2022
Merged

Do not create close listener handlers for every new request (master) #3859

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions webclient/webclient/src/main/java/io/helidon/webclient/NettyClientHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2021 Oracle and/or its affiliates.
* Copyright (c) 2020, 2022 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -154,16 +154,6 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws IO
}
}

channel.closeFuture()
.addListener(f -> {
// Connection closed without last HTTP content received. Some server problem
// so we need to fail the publisher and report an exception.
if (!responseCloser.isClosed()) {
WebClientException exception = new WebClientException("Connection reset by the host");
publisher.fail(exception);
}
});

requestConfiguration.cookieManager().put(requestConfiguration.requestURI(),
clientResponse.headers().toMap());

Expand Down Expand Up @@ -236,6 +226,17 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws IO
}
}

@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
super.channelInactive(ctx);
// Connection closed without last HTTP content received. Some server problem
// so we need to fail the publisher and report an exception.
if (publisher != null && !responseCloser.isClosed()) {
WebClientException exception = new WebClientException("Connection reset by the host");
publisher.fail(exception);
}
}

private boolean shouldResponseAutomaticallyClose(WebClientResponse clientResponse) {
WebClientResponseHeaders headers = clientResponse.headers();
if (clientResponse.status() == Http.Status.NO_CONTENT_204) {
Expand Down