/hg/icedtea-web: Fixed PR3637 - making cache work with jdk9+ #ru...

[jvanek at icedtea.classpath.org]

changeset f211a6ffffe0 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f211a6ffffe0
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Nov 27 13:26:48 2018 +0100

	Fixed PR3637 - making cache work with jdk9+ #runtime jar url anchor

	* netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java: (retrieve) if jar is not found in cache, ale url without anchor is attempted
	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: usinf localFile.toURI().toURL() instead of direct localFile.toURL()


diffstat:

 ChangeLog                                                    |  7 +++++++
 netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java |  6 ++++++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java       |  2 +-
 3 files changed, 14 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r 6b6da5f22c26 -r f211a6ffffe0 ChangeLog
--- a/ChangeLog	Fri Nov 23 15:33:01 2018 +0100
+++ b/ChangeLog	Tue Nov 27 13:26:48 2018 +0100
@@ -1,3 +1,10 @@
+2018-11-27  Jiri Vanek <jvanek at redhat.com>
+            Lars Herschke <lhersch at dssgmbh.de>
+
+	Fixed PR3637 - making cache work with jdk9+ #runtime jar url anchor
+	* netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java: (retrieve) if jar is not found in cache, ale url without anchor is attempted
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: usinf localFile.toURI().toURL() instead of direct localFile.toURL()
+
 2018-11-23  Lars Herschke <lhersch at dssgmbh.de>
             Jiri Vanek <jvanek at redhat.com>
 
diff -r 6b6da5f22c26 -r f211a6ffffe0 netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
--- a/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java	Fri Nov 23 15:33:01 2018 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java	Tue Nov 27 13:26:48 2018 +0100
@@ -86,6 +86,12 @@
     @Override
     public java.util.jar.JarFile retrieve(URL url) throws IOException {
         URL localUrl = mapping.get(url);
+        if (localUrl == null) {
+            if (url.getRef() != null) {
+                url = new URL(url.toString().substring(0, url.toString().lastIndexOf(url.getRef()) - 1));
+                localUrl = mapping.get(url);
+            }
+        }
 
         if (localUrl == null) {
             /*
diff -r 6b6da5f22c26 -r f211a6ffffe0 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Nov 23 15:33:01 2018 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Nov 27 13:26:48 2018 +0100
@@ -1401,7 +1401,7 @@
                         // there is currently no mechanism to cache files per
                         // instance.. so only index cached files
                         if (localFile != null) {
-                            CachedJarFileCallback.getInstance().addMapping(jar.getLocation(), localFile.toURL());
+                            CachedJarFileCallback.getInstance().addMapping(jar.getLocation(), localFile.toURI().toURL());
 
                             try (JarFile jarFile = new JarFile(localFile.getAbsolutePath())) {
                                 Manifest mf = jarFile.getManifest();