Merge pull request #250 from jekh/request-response-capture-filter

Request and response capture filter cleanup

Author: jekh

browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ClientRequestCaptureFilter.java

@@ -26,18 +26,18 @@ public class ClientRequestCaptureFilter extends HttpFiltersAdapter {
      * Populated by clientToProxyRequest() when processing the HttpRequest object. Unlike originalRequest,
      * this represents the "real" request that is being sent to the server, including headers.
      */
-    private HttpRequest httpRequest;
+    private volatile HttpRequest httpRequest;
 
     /**
      * Populated by clientToProxyRequest() when processing the HttpContent objects. If the request is chunked,
      * it will be populated across multiple calls to clientToProxyRequest().
      */
-    private ByteArrayOutputStream requestContents = new ByteArrayOutputStream();
+    private final ByteArrayOutputStream requestContents = new ByteArrayOutputStream();
 
     /**
      * Populated by clientToProxyRequest() when processing the LastHttpContent.
      */
-    private HttpHeaders trailingHeaders;
+    private volatile HttpHeaders trailingHeaders;
 
     public ClientRequestCaptureFilter(HttpRequest originalRequest) {
         super(originalRequest);

browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/ServerResponseCaptureFilter.java

@@ -29,7 +29,7 @@ public class ServerResponseCaptureFilter extends HttpFiltersAdapter {
     /**
      * Populated by serverToProxyResponse() when processing the HttpResponse object
      */
-    private HttpResponse httpResponse;
+    private volatile HttpResponse httpResponse;
 
     /**
      * Populated by serverToProxyResponse() as it receives HttpContent responses. If the response is chunked, it will
@@ -41,27 +41,27 @@ public class ServerResponseCaptureFilter extends HttpFiltersAdapter {
      * Populated when processing the LastHttpContent. If the response is compressed and decompression is requested,
      * this contains the entire decompressed response. Otherwise it contains the raw response.
      */
-    private byte[] fullResponseContents;
+    private volatile byte[] fullResponseContents;
 
     /**
      * Populated by serverToProxyResponse() when it processes the LastHttpContent object.
      */
-    private HttpHeaders trailingHeaders;
+    private volatile HttpHeaders trailingHeaders;
 
     /**
      * Set to true when processing the LastHttpContent if the server indicates there is a content encoding.
      */
-    private boolean responseCompressed;
+    private volatile boolean responseCompressed;
 
     /**
      * Set to true when processing the LastHttpContent if decompression was requested and successful.
      */
-    private boolean decompressionSuccessful;
+    private volatile boolean decompressionSuccessful;
 
     /**
      * Populated when processing the LastHttpContent.
      */
-    private String contentEncoding;
+    private volatile String contentEncoding;
 
     /**
      * User option indicating compressed content should be uncompressed.