From 03b4b80e4ddecc939dc3e28cf768cf4bcf6dc5ce Mon Sep 17 00:00:00 2001 From: "idk%eng.sun.com" Date: Fri, 25 Feb 2000 21:16:18 +0000 Subject: [PATCH] Fix for 27690 Converted "path" to canonical form a=avm@sparc.spb.su r=idk@eng.sun.com git-svn-id: svn://10.0.0.236/trunk@61681 18797224-902f-48f8-a5cc-f745e15eee43 --- .../classes/org/mozilla/pluglet/PlugletLoader.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mozilla/java/plugins/classes/org/mozilla/pluglet/PlugletLoader.java b/mozilla/java/plugins/classes/org/mozilla/pluglet/PlugletLoader.java index 968e6eaa4bd..ec58d04687a 100644 --- a/mozilla/java/plugins/classes/org/mozilla/pluglet/PlugletLoader.java +++ b/mozilla/java/plugins/classes/org/mozilla/pluglet/PlugletLoader.java @@ -25,6 +25,7 @@ import java.net.URL; import java.util.jar.Manifest; import java.util.jar.Attributes; import java.io.InputStream; +import java.io.File; import org.mozilla.pluglet.mozilla.*; import java.security.*; import java.awt.*; @@ -39,7 +40,17 @@ public class PlugletLoader { // path to jar file. Name of main class sould to be in MANIFEST. public static PlugletFactory getPluglet(String path) { try { - org.mozilla.util.DebugPluglet.print("-- PlugletLoader.getPluglet("+path+")\n"); + org.mozilla.util.DebugPluglet.print("-- PlugletLoader.getPluglet("+path+")\n"); + File file = (new File(path)).getCanonicalFile(); //To avoid spelling diffs, e.g c: and C: + path = file.getAbsolutePath(); + if (File.separatorChar != '/') { + path = path.replace(File.separatorChar,'/'); + + } + if (!path.startsWith("/")) { + path = "/" + path; + + } URL url = new URL("file:"+path); URLClassLoader loader = URLClassLoader.newInstance(new URL[]{url}); URL manifestURL = new URL("jar:file:"+path+"!/META-INF/MANIFEST.MF");