[jboss-cvs] JBossAS SVN: r69560 - in projects/vfs/trunk/src: test/java/org/jboss/test/virtual/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-02-03 18:49:13 -0500 (Sun, 03 Feb 2008)
New Revision: 69560

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileVFSUnitTestCase.java
Log:
Fix zero byte content.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java	2008-02-03 10:59:04 UTC (rev 69559)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java	2008-02-03 23:49:13 UTC (rev 69560)
@@ -119,9 +119,9 @@
    {
       byte[] contents;
       int size = (int)wrapper.getSize();
-      if (size > 0)
+      if (size != 0)
       {
-         ByteArrayOutputStream baos = new ByteArrayOutputStream(size);
+         ByteArrayOutputStream baos = size > 0 ? new ByteArrayOutputStream(size) : new ByteArrayOutputStream();
          byte[] tmp = new byte[1024];
          while (zis.available() > 0)
          {

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileVFSUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileVFSUnitTestCase.java	2008-02-03 10:59:04 UTC (rev 69559)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileVFSUnitTestCase.java	2008-02-03 23:49:13 UTC (rev 69560)
@@ -522,19 +522,24 @@
    }
 
 /*
-   public void testNestedNestedParent()
+   public void testNoCopyNestedStream()
       throws Exception
    {
       URL rootURL = getResource("/vfs/seam/jboss-seam-booking.ear");
       VFS vfs = VFS.getVFS(rootURL);
 
-      // Find the outer.jar
-      VirtualFile props = vfs.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-debug.jar/seam.properties");
-      assertNotNull("seam.properties", props);
-      VirtualFile debug = props.getParent();
-      assertNotNull(debug);
-      VirtualFile lib = debug.getParent();
-      assertNotNull(lib);
+      VirtualFile clazz = vfs.getChild("lib/commons-beanutils.jar/org/apache/commons/beanutils/BeanComparator.class");
+      assertNotNull(clazz);
+      URL url = clazz.toURL();
+      InputStream is = url.openStream();
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      byte[] tmp = new byte[1024];
+      int read = 0;
+      while ( (read = is.read(tmp)) >= 0 )
+         baos.write(tmp, 0, read);
+      byte[] bytes = baos.toByteArray();
+      int size = bytes.length;
+      System.out.println("size = " + size);
    }
 */