Merge pull request #42 from comoyo/emjar-dir-resource-lookup

[emjar] Ensure that directory resources are resolvable without termiating slash

Author: argggh

emjar/src/main/java/com/comoyo/emjar/OndemandEmbeddedJar.java

@@ -196,7 +196,8 @@ public InputStream getInputStream(ZipEntry ze)
         @Override
         public JarEntry	getJarEntry(String name)
         {
-            return entries.get(name);
+            final JarEntry entry = entries.get(name);
+            return entry != null ? entry : entries.get(name + "/");
         }
 
         public Manifest getManifest() {

emjar/src/main/java/com/comoyo/emjar/PreloadedEmbeddedJar.java

@@ -178,7 +178,8 @@ public InputStream getInputStream(ZipEntry ze)
 
         @Override
         public JarEntry	getJarEntry(String name) {
-            return entries.get(name);
+            final JarEntry entry = entries.get(name);
+            return entry != null ? entry : entries.get(name + "/");
         }
 
         @Override

emjar/src/main/java/com/comoyo/emjar/ZipScanner.java

@@ -167,7 +167,7 @@ private void parseDirectory(
             final int startDiskNum = dir.getShort(pos + ZipFile.CENDSK);
             final int headerOffs = dir.getInt(pos + ZipFile.CENOFF);
             if (nameLen > buf.length) {
-                buf = new byte[buf.length * 2];
+                buf = new byte[nameLen];
             }
             dir.position(pos + ZipFile.CENHDR);
             dir.get(buf, 0, nameLen);

emjar/src/test/java/com/comoyo/emjar/JarTest.java

@@ -46,6 +46,8 @@ protected JarFile testJarBundle(String name)
             = new BufferedReader(new InputStreamReader(
                                      jar.getInputStream(new JarEntry("entry-" + name + ".txt"))));
         assertEquals("Contents mismatch for " + name, name, entry.readLine());
+        final JarEntry dirEntry = jar.getJarEntry("dir-entry");
+        assertNotNull("Entry for directory was not found", dirEntry);
         return jar;
     }