[armedbear-cvs] r12545 - branches/0.19.x/abcl/src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Mon Mar 15 09:57:06 2010
New Revision: 12545

Log:
Backport r12544: Fix win32 bugs with :ABSOLUTE directory entries for jar pathnames.


Modified:
   branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java

Modified: branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java	(original)
+++ branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java	Mon Mar 15 09:57:06 2010
@@ -525,8 +525,10 @@
         }
         String directoryNamestring = getDirectoryNamestring();
         if (isJar()) {
-            if (directoryNamestring.startsWith(File.separator)) {
+            if (directoryNamestring.startsWith("/")) {
                 sb.append(directoryNamestring.substring(1));
+            } else {
+                sb.append(directoryNamestring);
             }
         } else {
             sb.append(directoryNamestring);
@@ -643,7 +645,6 @@
 		    result.append(c);
 		}
 	    }
-	    return result.toString();
         } else  {
             result.append(path);
         }