AXIS2-5948 Proxy settings ignored if username not specified

Author: robertlazarski

modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPProxyConfigurator.java

@@ -145,16 +145,14 @@ public static void configure(MessageContext messageContext, RequestConfig.Builde
 
 	// AXIS2-6051, CredentialsProvider no longer has setCredentialsProvider() however BasicCredentialsProvider
 	// does have it. clientContext.getCredentialsProvider() returns CredentialsProvider. 
-        HttpHost proxy = new HttpHost(proxyHost, proxyPort);
 	if (proxyCredentials != null) {
-            if (clientContext.getCredentialsProvider() == null) {
-                BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
-                clientContext.setCredentialsProvider(credsProvider);
-                credsProvider.setCredentials(new AuthScope(null, -1), proxyCredentials);
-            }
             requestConfig.setAuthenticationEnabled(true);
-            requestConfig.setProxy(proxy);
+            BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
+            clientContext.setCredentialsProvider(credsProvider);
+            credsProvider.setCredentials(new AuthScope(null, -1), proxyCredentials);
 	}
+        HttpHost proxy = new HttpHost(proxyHost, proxyPort);
+        requestConfig.setProxy(proxy);
     }
 
     private static OMElement getProxyConfigurationElement(Parameter proxySettingsFromAxisConfig)