You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2018/06/16 08:42:32 UTC
httpcomponents-client git commit: HTTPCLIENT-1924: HttpClient to shut
down the connection manager if a fatal error occurs in the course of a
request execution
Repository: httpcomponents-client
Updated Branches:
refs/heads/4.6.x 749338826 -> 8282725d9
HTTPCLIENT-1924: HttpClient to shut down the connection manager if a fatal error occurs in the course of a request execution
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/8282725d
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/8282725d
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/8282725d
Branch: refs/heads/4.6.x
Commit: 8282725d929813cb532cd0933d65aee520fc31c5
Parents: 7493388
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sat Jun 16 10:33:24 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sat Jun 16 10:35:53 2018 +0200
----------------------------------------------------------------------
.../main/java/org/apache/http/impl/execchain/MainClientExec.java | 3 +++
.../java/org/apache/http/impl/execchain/MinimalClientExec.java | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/8282725d/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java b/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
index 579ffed..0124f91 100644
--- a/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
+++ b/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
@@ -355,6 +355,9 @@ public class MainClientExec implements ClientExecChain {
} catch (final RuntimeException ex) {
connHolder.abortConnection();
throw ex;
+ } catch (final Error error) {
+ connManager.shutdown();
+ throw error;
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/8282725d/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java b/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java
index bc82904..113c695 100644
--- a/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java
+++ b/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java
@@ -247,6 +247,9 @@ public class MinimalClientExec implements ClientExecChain {
} catch (final RuntimeException ex) {
releaseTrigger.abortConnection();
throw ex;
+ } catch (final Error error) {
+ connManager.shutdown();
+ throw error;
}
}