commit 6406334d845951bbc40920d928da5ad099856af5
author Neil Fuller <nfuller@google.com> Tue Aug 09 16:12:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 16:12:27 2016 +0000
tree 0a1c4689f53911f411184dd43d17de95b1823f98
parent 9197c89071e555620184d83ac7ee9ee491e55fd5
parent f1026cb99ee79a035b0adbb50dec9eb5185ce58f

Merge "Initialize MockWebServer in setUp() not construction time"
am: f1026cb99e

Change-Id: I9c114d40171d73c90dcc4e2ef75a2239d39e4e81

tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java

diff --git a/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java b/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java
index 545541d..7987a50 100644
--- a/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java
+++ b/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java
@@ -38,10 +38,11 @@
 public final class HttpResponseCacheTest extends TestCase {
 
     private File cacheDir;
-    private MockWebServer server = new MockWebServer();
+    private MockWebServer server;
 
     @Override public void setUp() throws Exception {
         super.setUp();
+        server = new MockWebServer();
         String tmp = System.getProperty("java.io.tmpdir");
         cacheDir = new File(tmp, "HttpCache-" + UUID.randomUUID());
         cacheDir.mkdirs();