harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r777687 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
Date Fri, 22 May 2009 19:58:58 GMT
Author: tellison
Date: Fri May 22 19:58:58 2009
New Revision: 777687

URL: http://svn.apache.org/viewvc?rev=777687&view=rev
Log:
Apply patch for HARMONY-6074 ([classlib][luni] JAR referenced in a JAR's manifest 'Class-Path'
that contains 'file' scheme URIs aren't loaded)

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java?rev=777687&r1=777686&r2=777687&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
Fri May 22 19:58:58 2009
@@ -1184,7 +1184,9 @@
             String element = tokenizer.nextToken();
             if (!element.equals("")) { //$NON-NLS-1$
                 try {
-                    URL newURL = new URL(protocol, host, port, file + element
+                    // Take absolute path case into consideration 
+                    URL elementURL = new URL(new URL(file), element);
+                    URL newURL = new URL(protocol, host, port, elementURL 
                             + "!/"); //$NON-NLS-1$
                     addedURLs.add(newURL);
                 } catch (MalformedURLException e) {



Mime
View raw message