[jboss-cvs] JBossAS SVN: r97705 - projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi.

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

Author: johnbailey
Date: 2009-12-10 14:30:34 -0500 (Thu, 10 Dec 2009)
New Revision: 97705

Modified:
   projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi/JavaZipFileSystem.java
Log:
Added support for calling getFile on a directory in JavaZipFileSystem

Modified: projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi/JavaZipFileSystem.java
===================================================================
--- projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi/JavaZipFileSystem.java	2009-12-10 18:37:51 UTC (rev 97704)
+++ projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi/JavaZipFileSystem.java	2009-12-10 19:30:34 UTC (rev 97705)
@@ -147,14 +147,18 @@
                 return cachedFile;
             }
             // nope, create a cached temp
-            final JarEntry zipEntry = getNodeEntry(zipNode);
-            final String name = zipEntry.getName();
-            cachedFile = buildFile(contentsDir, name);
-            if (zipEntry == null) {
-                cachedFile.mkdir();
-            } else {
-                VFSUtils.copyStreamAndClose(zipFile.getInputStream(zipEntry), new BufferedOutputStream(new FileOutputStream(cachedFile)));
+            cachedFile = buildFile(contentsDir, zipNode.name);
+            
+            if(zipNode.entry != null)
+            {
+               final JarEntry zipEntry = getNodeEntry(zipNode);
+               VFSUtils.copyStreamAndClose(zipFile.getInputStream(zipEntry), new BufferedOutputStream(new FileOutputStream(cachedFile)));
             }
+            else if(cachedFile.exists() == false) 
+            {
+               cachedFile.mkdir();
+            }
+            
             zipNode.cachedFile = cachedFile;
             return cachedFile;
         }