[HtmlUnit] SVN: [9635] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ HttpWebConnection.java

[<asa...@us...>]

Revision: 9635
          http://sourceforge.net/p/htmlunit/code/9635
Author:   asashour
Date:     2014-08-22 08:15:45 +0000 (Fri, 22 Aug 2014)
Log Message:
-----------
Fixing the build

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java	2014-08-22 07:28:39 UTC (rev 9634)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java	2014-08-22 08:15:45 UTC (rev 9635)
@@ -752,29 +752,35 @@
         }
 
         final String userAgent = webClient_.getBrowserVersion().getUserAgent();
-        for (final String header : webClient_.getBrowserVersion().getHeaderNamesOrdered()) {
-            if ("Host".equals(header)) {
-                httpMethod.setHeader(new BasicHeader(header, host.toString()));
+        final String[] headerNames = webClient_.getBrowserVersion().getHeaderNamesOrdered();
+        if (headerNames != null) {
+            for (final String header : headerNames) {
+                if ("Host".equals(header)) {
+                    httpMethod.setHeader(new BasicHeader(header, host.toString()));
+                }
+                else if ("User-Agent".equals(header)) {
+                    httpMethod.setHeader(new BasicHeader(header, userAgent));
+                }
+                else if ("Accept".equals(header) && requestHeaders.get(header) != null) {
+                    httpMethod.setHeader(new BasicHeader(header, requestHeaders.get(header)));
+                }
+                else if ("Accept-Language".equals(header) && requestHeaders.get(header) != null) {
+                    httpMethod.setHeader(new BasicHeader(header, requestHeaders.get(header)));
+                }
+                else if ("Accept-Encoding".equals(header) && requestHeaders.get(header) != null) {
+                    httpMethod.setHeader(new BasicHeader(header, requestHeaders.get(header)));
+                }
+                else if ("Connection".equals(header) && requestHeaders.get(header) != null) {
+                    httpMethod.setHeader(new BasicHeader(header, requestHeaders.get(header)));
+                }
+                else if ("DNT".equals(header) && webClient_.getOptions().isDoNotTrackEnabled()) {
+                    httpMethod.setHeader(new BasicHeader(header, "1"));
+                }
             }
-            else if ("User-Agent".equals(header)) {
-                httpMethod.setHeader(new BasicHeader(header, userAgent));
-            }
-            else if ("Accept".equals(header) && requestHeaders.get(header) != null) {
-                httpMethod.setHeader(new BasicHeader(header, requestHeaders.get(header)));
-            }
-            else if ("Accept-Language".equals(header) && requestHeaders.get(header) != null) {
-                httpMethod.setHeader(new BasicHeader(header, requestHeaders.get(header)));
-            }
-            else if ("Accept-Encoding".equals(header) && requestHeaders.get(header) != null) {
-                httpMethod.setHeader(new BasicHeader(header, requestHeaders.get(header)));
-            }
-            else if ("Connection".equals(header) && requestHeaders.get(header) != null) {
-                httpMethod.setHeader(new BasicHeader(header, requestHeaders.get(header)));
-            }
-            else if ("DNT".equals(header) && webClient_.getOptions().isDoNotTrackEnabled()) {
-                httpMethod.setHeader(new BasicHeader(header, "1"));
-            }
         }
+        else {
+            httpMethod.setHeader(new BasicHeader("User-Agent", userAgent));
+        }
 
         // not all browser versions have DNT by default as part of getHeaderNamesOrdered()
         // so we add it again, in case