Merge pull request lightbody#95 from romovs/upstream

Set filtering to false for everything except version.prop

Author: lightbody

pom.xml

@@ -102,10 +102,20 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <filtering>true</filtering>
+                <filtering>false</filtering>
                 <includes>
                     <include>**/**</include>
                 </includes>
+                <excludes>
+                    <exclude>version.prop</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>version.prop</include>
+                </includes>
             </resource>
         </resources>
         <defaultGoal>install</defaultGoal>

src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java

@@ -873,7 +873,9 @@ public HeaderElement[] getElements() throws ParseException {
         entry.getResponse().setBodySize(bytes);
         entry.getResponse().getContent().setSize(bytes);
         entry.getResponse().setStatus(statusCode);
-        entry.getResponse().setHttpVersion(response.getProtocolVersion().toString());
+        if (response != null) {
+        	entry.getResponse().setHttpVersion(response.getProtocolVersion().toString());
+        }
         if (statusLine != null) {
             entry.getResponse().setStatusText(statusLine.getReasonPhrase());
         }