[WAGON-449] Use new connection manager when set
Recreate the http-wagon CLIENT after calling
setPoolingHttpClientConnectionManager.
This also includes setting CLIENT to a nonfinal field, and as a result
its name is changed to httpClient to satisfy naming conventions.
diff --git a/pom.xml b/pom.xml
index fc9b1f5..02bd34a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,9 @@
<contributor>
<name>Grzegorz Grzybek</name>
</contributor>
+ <contributor>
+ <name>Jean Niklas L'orange</name>
+ </contributor>
</contributors>
<mailingLists>
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index f47e5ae..b01899d 100755
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -364,7 +364,7 @@
return connManager;
}
- private static final CloseableHttpClient CLIENT = createClient();
+ private static CloseableHttpClient httpClient = createClient();
private static CloseableHttpClient createClient()
{
@@ -481,6 +481,7 @@
PoolingHttpClientConnectionManager poolingHttpClientConnectionManager )
{
httpClientConnectionManager = poolingHttpClientConnectionManager;
+ httpClient = createClient();
}
public void put( File source, String resourceName )
@@ -829,7 +830,7 @@
}
}
- return CLIENT.execute( httpMethod, localContext );
+ return httpClient.execute( httpMethod, localContext );
}
protected void setHeaders( HttpUriRequest method )
