[jboss-cvs] JBossAS SVN: r90213 - projects/vfs/trunk/src/main/java/org/jboss/virtual/spi/zip/jzipfile.

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

Author: david.lloyd at jboss.com
Date: 2009-06-15 16:13:33 -0400 (Mon, 15 Jun 2009)
New Revision: 90213

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/spi/zip/jzipfile/JZipFileZipEntryProvider.java
Log:
Return an empty stream for non-FILE entries

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/spi/zip/jzipfile/JZipFileZipEntryProvider.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/spi/zip/jzipfile/JZipFileZipEntryProvider.java	2009-06-15 20:10:11 UTC (rev 90212)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/spi/zip/jzipfile/JZipFileZipEntryProvider.java	2009-06-15 20:13:33 UTC (rev 90213)
@@ -29,6 +29,7 @@
 
 import org.jboss.jzipfile.Zip;
 import org.jboss.jzipfile.ZipCatalog;
+import org.jboss.jzipfile.ZipEntryType;
 import org.jboss.virtual.spi.zip.ZipEntry;
 import org.jboss.virtual.spi.zip.ZipEntryProvider;
 import org.jboss.virtual.VFSUtils;
@@ -68,10 +69,18 @@
       }
    }
 
+   private static final InputStream EMPTY_STREAM = new InputStream()
+   {
+      public int read() throws IOException
+      {
+         return -1;
+      }
+   };
+
    public InputStream currentStream() throws IOException
    {
       final org.jboss.jzipfile.ZipEntry current = this.current;
-      return current == null ? null : Zip.openEntry(tempFile, current);
+      return current == null ? null : current.getEntryType() == ZipEntryType.FILE ? Zip.openEntry(tempFile, current) : EMPTY_STREAM;
    }
 
    public void close() throws IOException