changeset 11887:79aaa0f7f81a

6947916: JarURLConnection does not handle useCaches correctly Reviewed-by: chegar
author robm
date Tue, 13 Sep 2016 14:47:29 +0100
parents 59903dbf4122
children 9e5b59f2e30f
files src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java test/sun/net/www/protocol/jar/JarURLConnectionUseCaches.java
diffstat 2 files changed, 65 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java	Tue Sep 20 15:53:06 2016 +0300
+++ b/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java	Tue Sep 13 14:47:29 2016 +0100
@@ -125,7 +125,9 @@
              * to get the jarFile, and set it as our permission.
              */
             if (getUseCaches()) {
+                boolean oldUseCaches = jarFileURLConnection.getUseCaches();
                 jarFileURLConnection = factory.getConnection(jarFile);
+                jarFileURLConnection.setUseCaches(oldUseCaches);
             }
 
             if ((entryName != null)) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/net/www/protocol/jar/JarURLConnectionUseCaches.java	Tue Sep 13 14:47:29 2016 +0100
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016, 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 6947916
+ * @summary  JarURLConnection does not handle useCaches correctly
+ * @run main JarURLConnectionUseCaches
+ */
+
+import java.io.*;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.util.jar.*;
+
+public class JarURLConnectionUseCaches {
+    public static void main( String[] args ) throws IOException {
+        JarOutputStream out = new JarOutputStream(
+                new FileOutputStream("usecache.jar"));
+        out.putNextEntry(new JarEntry("test.txt"));
+        out.write("Test txt file".getBytes());
+        out.closeEntry();
+        out.close();
+
+        URL url = new URL("jar:"
+            + new File(".").toURI().toString()
+            + "/usecache.jar!/test.txt");
+
+        JarURLConnection c1 = (JarURLConnection)url.openConnection();
+        c1.setDefaultUseCaches( false );
+        c1.setUseCaches( true );
+        c1.connect();
+
+        JarURLConnection c2 = (JarURLConnection)url.openConnection();
+        c2.setDefaultUseCaches( false );
+        c2.setUseCaches( true );
+        c2.connect();
+
+        c1.getInputStream().close();
+        c2.getInputStream().read();
+        c2.getInputStream().close();
+    }
+}