diff options
| author | Andrew John Hughes <[email protected]> | 2010-12-03 20:19:12 +0000 |
|---|---|---|
| committer | Andrew John Hughes <[email protected]> | 2010-12-03 20:19:12 +0000 |
| commit | 0d66adf24179c33bbdccaacc10d4c8a5f5e2cd54 (patch) | |
| tree | 725e95de7981864e330850774c2a7d080881fb01 /netx | |
| parent | 8ddaf6d039146a442d35a7a31bfd48b061d456ff (diff) | |
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 <[email protected]>
* 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 (limited to 'netx')
4 files changed, 10 insertions, 5 deletions
diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java b/netx/net/sourceforge/jnlp/cache/CacheUtil.java index c5bb372..04b5adc 100644 --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java @@ -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 --git a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java index 1e74f17..e4d85b0 100644 --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java @@ -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 --git a/netx/net/sourceforge/jnlp/runtime/Boot.java b/netx/net/sourceforge/jnlp/runtime/Boot.java index 9f7c092..c4939b7 100644 --- a/netx/net/sourceforge/jnlp/runtime/Boot.java +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java @@ -258,7 +258,8 @@ public final class Boot implements PrivilegedAction<Void> { 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 --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java index e0d4d7a..aac70d0 100644 --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java @@ -469,7 +469,8 @@ public class JNLPClassLoader extends URLClassLoader { 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 URLClassLoader { 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 |