/hg/icedtea-web: Revert toURI().toURL() changes until we find a ...

[andrew at icedtea.classpath.org]

changeset ab266ebf1178 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ab266ebf1178
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Dec 03 20:19:12 2010 +0000

	Revert toURI().toURL() changes until we find a solution to the
	issues it raises: http://mail.openjdk.java.net/pipermail/distro-pkg-
	dev/2010-December/011270.html

	2010-12-03 Andrew John Hughes <ahughes at redhat.com>

	 * netx/net/sourceforge/jnlp/cache/CacheUtil.java,
	(getCachedResource(URL,Version,UpdatePolicy)): Revert change
	to use toURI() for now. See
	http://mail.openjdk.java.net/pipermail/distro-pkg-
	dev/2010-December/011270.html
		* netx/net/sourceforge/jnlp/cache/ResourceTracker.java,
	(getCacheURL(URL)): Likewise.
		* netx/net/sourceforge/jnlp/runtime/Boot.java, (getFile()):
	Use toURI.toURL() to avoid broken escaping.
		* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
	(initializeResources()): Likewise.


diffstat:

5 files changed, 23 insertions(+), 5 deletions(-)
ChangeLog                                              |   13 +++++++++++++
netx/net/sourceforge/jnlp/cache/CacheUtil.java         |    3 ++-
netx/net/sourceforge/jnlp/cache/ResourceTracker.java   |    3 ++-
netx/net/sourceforge/jnlp/runtime/Boot.java            |    3 ++-
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |    6 ++++--

diffs (82 lines):

diff -r 3dd021123e21 -r ab266ebf1178 ChangeLog
--- a/ChangeLog	Fri Dec 03 00:30:45 2010 +0000
+++ b/ChangeLog	Fri Dec 03 20:19:12 2010 +0000
@@ -1,3 +1,16 @@ 2010-12-01  Andrew John Hughes  <ahughes
+2010-12-03  Andrew John Hughes  <ahughes at redhat.com>
+
+	* netx/net/sourceforge/jnlp/cache/CacheUtil.java,
+	(getCachedResource(URL,Version,UpdatePolicy)):
+	Revert change to use toURI() for now.
+	See http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011270.html
+	* netx/net/sourceforge/jnlp/cache/ResourceTracker.java,
+	(getCacheURL(URL)): Likewise.
+	* netx/net/sourceforge/jnlp/runtime/Boot.java,
+	(getFile()): Use toURI.toURL() to avoid broken escaping.
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+	(initializeResources()): Likewise.
+
 2010-12-01  Andrew John Hughes  <ahughes at redhat.com>
 
 	* netx/net/sourceforge/jnlp/cache/CacheUtil.java:
diff -r 3dd021123e21 -r ab266ebf1178 netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java	Fri Dec 03 00:30:45 2010 +0000
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java	Fri Dec 03 20:19:12 2010 +0000
@@ -80,7 +80,8 @@ public class CacheUtil {
         rt.addResource(location, version, policy);
         try {
             File f = rt.getCacheFile(location);
-            return f.toURI().toURL();
+            // TODO: Should be toURI().toURL()
+            return f.toURL();
         }
         catch (MalformedURLException ex) {
             return location;
diff -r 3dd021123e21 -r ab266ebf1178 netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java	Fri Dec 03 00:30:45 2010 +0000
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java	Fri Dec 03 20:19:12 2010 +0000
@@ -331,7 +331,8 @@ public class ResourceTracker {
         try {
             File f = getCacheFile(location);
             if (f != null)
-                return f.toURI().toURL();
+                // TODO: Should be toURI().toURL()
+                return f.toURL();
         }
         catch (MalformedURLException ex) {
             if (JNLPRuntime.isDebug())
diff -r 3dd021123e21 -r ab266ebf1178 netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java	Fri Dec 03 00:30:45 2010 +0000
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java	Fri Dec 03 20:19:12 2010 +0000
@@ -258,7 +258,8 @@ public final class Boot implements Privi
 
         try {
             if (new File(location).exists())
-                url = new File(location).toURI().toURL(); // Why use file.getCanonicalFile?
+                // TODO: Should be toURI().toURL()
+                url = new File(location).toURL(); // Why use file.getCanonicalFile?
             else
                 url = new URL(ServiceUtil.getBasicService().getCodeBase(), location);
         } catch (Exception e) {
diff -r 3dd021123e21 -r ab266ebf1178 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Dec 03 00:30:45 2010 +0000
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Dec 03 20:19:12 2010 +0000
@@ -469,7 +469,8 @@ public class JNLPClassLoader extends URL
                                         continue; // JAR not found. Keep going.
                                 }
 
-                                URL location = cachedFile.toURI().toURL();
+                                // TODO: Should be toURI().toURL()
+                                URL location = cachedFile.toURL();
                                 SecurityDesc jarSecurity = file.getSecurity();
 
                                 if (file instanceof PluginBridge) {
@@ -651,7 +652,8 @@ public class JNLPClassLoader extends URL
                     try {
                         URL location = jar.getLocation(); // non-cacheable, use source location
                         if (localFile != null) {
-                            location = localFile.toURI().toURL(); // cached file
+                            // TODO: Should be toURI().toURL()
+                            location = localFile.toURL(); // cached file
 
                             // This is really not the best way.. but we need some way for
                             // PluginAppletViewer::getCachedImageRef() to check if the image