7133367: ResponseCache.put should not be called when setUseCaches(false)

Reviewed-by: michaelm

jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java

@@ -270,7 +270,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
     protected Proxy instProxy;
 
     private CookieHandler cookieHandler;
-    private ResponseCache cacheHandler;
+    private final ResponseCache cacheHandler;
 
     // the cached response, and cached response headers and body
     protected CacheResponse cachedResponse;
@@ -1579,7 +1579,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
 
                 if (respCode == 200 || respCode == 203 || respCode == 206 ||
                     respCode == 300 || respCode == 301 || respCode == 410) {
-                    if (cacheHandler != null) {
+                    if (cacheHandler != null && getUseCaches()) {
                         // give cache a chance to save response in cache
                         URI uri = ParseUtil.toURI(url);
                         if (uri != null) {

jdk/test/sun/net/www/protocol/http/NoCache.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7133367
+ * @summary ResponseCache.put should not be called when setUseCaches(false)
+ */
+
+import java.net.*;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+public class NoCache
+{
+    public static void main(String[] args) throws IOException {
+        ResponseCache.setDefault(new ThrowingCache());
+
+        HttpServer server = startHttpServer();
+        try {
+            URL url = new URL("http://" + InetAddress.getLocalHost().getHostAddress()
+                          + ":" + server.getAddress().getPort() + "/NoCache/");
+            URLConnection uc = url.openConnection();
+            uc.setUseCaches(false);
+            uc.getInputStream().close();
+        } finally {
+            server.stop(0);
+            // clear the system-wide cache handler, samevm/agentvm mode
+            ResponseCache.setDefault(null);
+        }
+    }
+
+    static class ThrowingCache extends ResponseCache {
+        @Override
+        public CacheResponse get(URI uri, String rqstMethod,
+                                 Map<String,List<String>> rqstHeaders) {
+            throw new RuntimeException("ResponseCache.get should not be called");
+        }
+
+        @Override
+        public CacheRequest put(URI uri, URLConnection conn) {
+            throw new RuntimeException("ResponseCache.put should not be called");
+        }
+    }
+
+    // HTTP Server
+    static HttpServer startHttpServer() throws IOException {
+        HttpServer httpServer = HttpServer.create(new InetSocketAddress(0), 0);
+        httpServer.createContext("/NoCache/", new SimpleHandler());
+        httpServer.start();
+        return httpServer;
+    }
+
+    static class SimpleHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            t.sendResponseHeaders(200, -1);
+            t.close();
+        }
+    }
+}