commit 01e1fae7e97c4f1597943faec737ff1ec189e1c9
author Marcel Offermans <marrs@apache.org> Mon May 21 08:24:03 2012 +0000
committer Marcel Offermans <marrs@apache.org> Mon May 21 08:24:03 2012 +0000
tree 2a627c2ff48bdba4dd1f6d4bc39656d6ac2e6cc2
parent c6aefbdf4a091fadc755d890f2f75e863d5a9ba4

FELIX-3515 Now closes the stream after trying to read any extra data at the end of a ZIP file from it.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1340927 13f79535-47bb-0310-9956-ffa450edef68

deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java

diff --git a/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java b/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java
index c644a42..0cf664a 100644
--- a/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java
+++ b/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java
@@ -135,14 +135,6 @@
             if (writer != null) {
                 writer.close();
             }
-            if (input != null) {
-                try {
-                    input.close();
-                }
-                catch (IOException e) {
-                    pushException(e);
-                }
-            }
         }
         
         try {
@@ -155,6 +147,16 @@
         catch (IOException e) {
             pushException(e);
         }
+        finally {
+            if (input != null) {
+                try {
+                    input.close();
+                }
+                catch (IOException e) {
+                    pushException(e);
+                }
+            }
+        }
     }
     
     private void pushException(Exception e) {