Fix zip file generating: ZipOutputStream should be closed to finish z…

…ip creating correctly #16
stepio · Jan 16, 2016 · ebdb76b · ebdb76b
1 parent 8ba5cf6
commit ebdb76b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jpasskit/src/main/java/de/brendamour/jpasskit/signing/PKFileBasedSigningUtil.java b/jpasskit/src/main/java/de/brendamour/jpasskit/signing/PKFileBasedSigningUtil.java
@@ -187,10 +187,10 @@ private byte[] createZippedPassAndReturnAsByteArray(final File tempPassDir) thro
         ByteArrayOutputStream byteArrayOutputStreamForZippedPass = new ByteArrayOutputStream(); // closed with the parent ZipOutputStream
         try (ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStreamForZippedPass)) {
             zip(tempPassDir, tempPassDir, zipOutputStream);
-            return byteArrayOutputStreamForZippedPass.toByteArray();
         } catch (IOException e) {
             throw new PKSigningException("Error while creating a zip package", e);
         }
+        return byteArrayOutputStreamForZippedPass.toByteArray();
     }
 
     private final void zip(final File directory, final File base, final ZipOutputStream zipOutputStream) throws IOException {

diff --git a/jpasskit/src/main/java/de/brendamour/jpasskit/signing/PKInMemorySigningUtil.java b/jpasskit/src/main/java/de/brendamour/jpasskit/signing/PKInMemorySigningUtil.java
@@ -127,9 +127,9 @@ private byte[] createZippedPassAndReturnAsByteArray(final Map<String, ByteBuffer
                 zipOutputStream.putNextEntry(entry);
                 IOUtils.copy(new ByteArrayInputStream(passResourceFile.getValue().array()), zipOutputStream);
             }
-            return byteArrayOutputStreamForZippedPass.toByteArray();
         } catch (IOException e) {
             throw new PKSigningException("Error while creating a zip package", e);
         }
+        return byteArrayOutputStreamForZippedPass.toByteArray();
     }
 }