You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by db...@apache.org on 2011/12/08 21:06:28 UTC

svn commit: r1212079 - in /geronimo/xbean/trunk/xbean-finder/src: main/java/org/apache/xbean/finder/archive/JarArchive.java test/java/org/apache/xbean/finder/archive/Archives.java

Author: dblevins
Date: Thu Dec  8 20:06:28 2011
New Revision: 1212079

URL: http://svn.apache.org/viewvc?rev=1212079&view=rev
Log:
Patch from Mart Köhler to revert bug added in r1095858, XBEAN-193: Wrong separator for JarArchives
Thank you, Mart!

Modified:
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java
    geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/Archives.java

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java?rev=1212079&r1=1212078&r2=1212079&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java (original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/JarArchive.java Thu Dec  8 20:06:28 2011
@@ -16,7 +16,6 @@
  */
 package org.apache.xbean.finder.archive;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -126,7 +125,7 @@ public class JarArchive implements Archi
         if (className.contains(".")) {
             return;
         }
-        className = className.replace(File.separatorChar, '.');
+        className = className.replace('/', '.');
         classNames.add(className);
     }
 }

Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/Archives.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/Archives.java?rev=1212079&r1=1212078&r2=1212079&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/Archives.java (original)
+++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/archive/Archives.java Thu Dec  8 20:06:28 2011
@@ -107,7 +107,7 @@ public class Archives {
         ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(classpath)));
 
         for (Class clazz : classes) {
-            String name = clazz.getName().replace('.', File.separatorChar) + ".class";
+            String name = clazz.getName().replace('.', '/') + ".class";
 
             URL resource = loader.getResource(name);
             assertNotNull(resource);