Better fix proposed by Benjamin

Author: jfarcand

src/main/java/com/ning/http/client/ProxyServer.java

@@ -51,7 +51,7 @@ public String toString() {
     private final String principal;
     private final String password;
     private int port;
-    private String ntlmDomain;
+    private String ntlmDomain = System.getProperty("http.auth.ntlm.domain", "");
 
     public ProxyServer(final Protocol protocol, final String host, final int port, String principal, String password) {
         this.protocol = protocol;

src/main/java/com/ning/http/client/Realm.java

@@ -266,7 +266,7 @@ public static class RealmBuilder {
         private String uri = "";
         private String methodName = "GET";
         private boolean usePreemptive = false;
-        private String domain = "";
+        private String domain = System.getProperty("http.auth.ntlm.domain", "");
         private String enc = "UTF-8";
         private String host = "localhost";
         private boolean messageType2Received = false;
@@ -560,14 +560,6 @@ public Realm build() {
                 }
             }
 
-            if (scheme.equals(AuthScheme.NTLM) && domain.equalsIgnoreCase("")){
-                logger.info("NTLM domain is not set, trying to read it from system property -Dhttp.auth.ntlm.domain");
-                String tmp = System.getProperty("http.auth.ntlm.domain");
-                if (tmp != null) {
-                    domain = tmp;
-                }
-            }
-
             return new Realm(scheme,
                     principal,
                     password,

src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -498,15 +498,7 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
                 }
 
                 if (proxyServer.getProtocol().equals(ProxyServer.Protocol.NTLM)) {
-
                     jdkNtlmDomain = System.getProperty(NTLM_DOMAIN);
-                    if (proxyServer.getNtlmDomain() == null) {
-                        logger.info("NTLM domain is not set, trying to read it from system property -D{}", NTLM_DOMAIN);
-                        if (jdkNtlmDomain != null) {
-                            proxyServer.setNtlmDomain(jdkNtlmDomain);
-                        }
-                    }
-
                     System.setProperty(NTLM_DOMAIN, proxyServer.getNtlmDomain());
                 }
             }
@@ -530,11 +522,7 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
                         break;
                     case NTLM:
                         jdkNtlmDomain = System.getProperty(NTLM_DOMAIN);
-                        if (realm.getNtlmDomain() == null) {
-                            logger.info("NTLM domain is not set, trying to read it from system property -D{}", NTLM_DOMAIN);
-                        } else {
-                            System.setProperty(NTLM_DOMAIN, realm.getNtlmDomain());
-                        }
+                        System.setProperty(NTLM_DOMAIN, realm.getDomain());
                         break;
                     default:
                         throw new IllegalStateException(String.format("Invalid Authentication %s", realm.toString()));