This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 33f6b1d6bca702c9de20d2da6e60dd39cefc418c
Author: Robert Lazarski <robertlazar...@gmail.com>
AuthorDate: Mon Mar 3 09:58:25 2025 -1000
remove obsolete HTTPClient constants for 3.x and 4.x
---
.../axis2/transport/http/AbstractHTTPTransportSender.java | 2 +-
.../java/org/apache/axis2/transport/http/AxisServlet.java | 15 ++++-----------
.../axis2/transport/http/HTTPTransportConstants.java | 3 +--
.../http/impl/httpclient5/HTTPClient5TransportSender.java | 2 +-
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
index 75fd48edca..ea1e750d5f 100644
---
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
+++
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
@@ -495,7 +495,7 @@ public abstract class AbstractHTTPTransportSender extends
AbstractHandler implem
public void setHTTPClientVersion(ConfigurationContext
configurationContext) {
configurationContext.setProperty(HTTPTransportConstants.HTTP_CLIENT_VERSION,
- HTTPTransportConstants.HTTP_CLIENT_3_X_VERSION);
+ HTTPTransportConstants.HTTP_CLIENT_5_X_VERSION);
}
}
diff --git
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/AxisServlet.java
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/AxisServlet.java
index ec63e2e518..ecccc73e4a 100644
---
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/AxisServlet.java
+++
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/AxisServlet.java
@@ -589,17 +589,10 @@ public class AxisServlet extends HttpServlet {
// AXIS2-4898: MultiThreadedHttpConnectionManager starts a thread that
is not stopped by the
// shutdown of the connection manager. If we want to avoid a resource
leak, we need to call
// shutdownAll here.
- // TODO - This action need be changed according to current HTTPClient.
- String clientVersion = getHTTPClientVersion();
- if (clientVersion != null
- &&
HTTPTransportConstants.HTTP_CLIENT_4_X_VERSION.equals(clientVersion)) {
- // TODO - Handle for HTTPClient 4
- } else {
- try {
-
Class.forName("org.apache.commons.httpclient.MultiThreadedHttpConnectionManager").getMethod("shutdownAll").invoke(null);
- } catch (Exception ex) {
- log.warn("Failed to shut down
MultiThreadedHttpConnectionManager", ex);
- }
+ try {
+
Class.forName("org.apache.commons.httpclient.MultiThreadedHttpConnectionManager").getMethod("shutdownAll").invoke(null);
+ } catch (Exception ex) {
+ log.error("Failed to shut down
MultiThreadedHttpConnectionManager", ex);
}
}
diff --git
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/HTTPTransportConstants.java
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/HTTPTransportConstants.java
index 73dfeb526c..e81843e929 100644
---
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/HTTPTransportConstants.java
+++
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/HTTPTransportConstants.java
@@ -40,8 +40,7 @@ public class HTTPTransportConstants {
//Settings to define HTTPClient version
public static final String HTTP_CLIENT_VERSION = "http.client.version";
- public static final String HTTP_CLIENT_3_X_VERSION =
"http.client.version.3x";
- public static final String HTTP_CLIENT_4_X_VERSION =
"http.client.version.4x";
+ public static final String HTTP_CLIENT_5_X_VERSION =
"http.client.version.5x";
public static final String ANONYMOUS = "anonymous";
public static final String PROXY_HOST_NAME = "proxy_host";
diff --git
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPClient5TransportSender.java
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPClient5TransportSender.java
index 1d6fc46607..581169f35a 100644
---
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPClient5TransportSender.java
+++
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPClient5TransportSender.java
@@ -63,7 +63,7 @@ public class HTTPClient5TransportSender extends
AbstractHTTPTransportSender {
public void setHTTPClientVersion(ConfigurationContext
configurationContext) {
configurationContext.setProperty(HTTPTransportConstants.HTTP_CLIENT_VERSION,
-
HTTPTransportConstants.HTTP_CLIENT_4_X_VERSION);
+
HTTPTransportConstants.HTTP_CLIENT_5_X_VERSION);
}
