[MASSEMBLY-742] Fix take 42

Author: krosenvold

src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java

@@ -516,6 +516,12 @@ else if ( o instanceof PlexusIoResourceCollection )
                             }
                             else
                             {
+                                // this will leak handles in the IO iterator if the iterator is not fully consumed.
+                                // alternately we'd have to make this method return a Closeable iterator back
+                                // to the client and ditch the whole issue onto the client.
+                                // this does not really make any sense either, might equally well change the
+                                // api into something that is not broken by design.
+                                closeQuietlyIfCloseable( ioResourceIter );
                                 ioResourceIter = null;
                             }
                         }
@@ -587,6 +593,33 @@ private String normalizedForDuplicateCheck(ArchiveEntry entry){
 
     }
 
+    private static void closeIfCloseable( Object resource )
+        throws IOException
+    {
+        if ( resource == null )
+        {
+            return;
+        }
+        if ( resource instanceof Closeable )
+        {
+            ( (Closeable) resource ).close();
+        }
+
+    }
+
+    private static void closeQuietlyIfCloseable( Object resource )
+    {
+        try
+        {
+            closeIfCloseable( resource );
+        }
+        catch ( IOException e )
+        {
+            throw new RuntimeException( e );
+        }
+    }
+
+
     public Map<String, ArchiveEntry> getFiles()
     {
         try
@@ -1007,14 +1040,13 @@ protected void cleanUp()
             {
                 resource = ( (PlexusIoProxyResourceCollection) resource ).getSrc();
             }
-            if ( resource instanceof Closeable )
-            {
-                ( (Closeable) resource ).close();
-            }
+
+            closeIfCloseable( resource );
         }
         resources.clear();
     }
 
+
     protected abstract void execute()
         throws ArchiverException, IOException;