Merge 29e3eff into 0d9276f

Author: gtache

modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java

@@ -46,13 +46,16 @@
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.NTCredentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.client.params.AuthPolicy;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.util.EntityUtils;
 
@@ -314,5 +317,15 @@ public void enableAuthentication(HTTPAuthenticator authenticator) {
             }
             requestConfig.setTargetPreferredAuthSchemes(authPrefs);
         }
+
+        if (authenticator.getPreemptiveAuthentication() && host != null) {
+            //Use authCache - could also set header
+            AuthCache authCache = clientContext.getAuthCache();
+            if (authCache == null) {
+                authCache = new BasicAuthCache();
+            }
+            authCache.put(new HttpHost(host), new BasicScheme());
+            clientContext.setAuthCache(authCache);
+        }
     }
 }