o Updated to stop supressing exceptions incorrectly.

ChristianSchulte · ChristianSchulte · commit 6c49e393bf90 · 2016-05-06T16:31:38.000+02:00
Closes #33
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
@@ -313,6 +313,8 @@ else if ( isDirectory )
                     out = new FileOutputStream( f );
 
                     IOUtil.copy( compressedInputStream, out );
+                    out.close();
+                    out = null;
                 }
                 finally
                 {
diff --git a/src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2Compressor.java b/src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2Compressor.java
@@ -20,7 +20,6 @@
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.util.Compressor;
-import org.codehaus.plexus.util.IOUtil;
 
 import java.io.IOException;
 
@@ -56,7 +55,17 @@ public void compress()
 
     public void close()
     {
-        IOUtil.close( zOut );
-        zOut = null;
+        try
+        {
+            if ( this.zOut != null )
+            {
+                this.zOut.close();
+                zOut = null;
+            }
+        }
+        catch ( final IOException e )
+        {
+            throw new ArchiverException( "Failure closing target.", e );
+        }
     }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/gzip/GZipCompressor.java b/src/main/java/org/codehaus/plexus/archiver/gzip/GZipCompressor.java
@@ -20,7 +20,6 @@
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.util.Compressor;
 import org.codehaus.plexus.archiver.util.Streams;
-import org.codehaus.plexus.util.IOUtil;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -55,7 +54,17 @@ public void compress()
 
     public void close()
     {
-        IOUtil.close( zOut );
-        zOut = null;
+        try
+        {
+            if ( this.zOut != null )
+            {
+                this.zOut.close();
+                zOut = null;
+            }
+        }
+        catch ( final IOException e )
+        {
+            throw new ArchiverException( "Failure closing target.", e );
+        }
     }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java
@@ -204,7 +204,10 @@ private Manifest getManifest( File manifestFile )
         try
         {
             in = new FileInputStream( manifestFile );
-            return getManifest( in );
+            final Manifest mf = getManifest( in );
+            in.close();
+            in = null;
+            return mf;
         }
         catch ( IOException e )
         {
diff --git a/src/main/java/org/codehaus/plexus/archiver/jar/JdkManifestFactory.java b/src/main/java/org/codehaus/plexus/archiver/jar/JdkManifestFactory.java
@@ -32,32 +32,33 @@ class JdkManifestFactory
     public static java.util.jar.Manifest getDefaultManifest()
         throws ArchiverException
     {
+        InputStream in = null;
+        final String defManifest = "/org/codehaus/plexus/archiver/jar/defaultManifest.mf";
         try
         {
-            String defManifest = "/org/codehaus/plexus/archiver/jar/defaultManifest.mf";
-            InputStream in = JdkManifestFactory.class.getResourceAsStream( defManifest );
+            in = JdkManifestFactory.class.getResourceAsStream( defManifest );
             if ( in == null )
             {
                 throw new ArchiverException( "Could not find default manifest: " + defManifest );
             }
-            try
-            {
-                java.util.jar.Manifest defaultManifest = new java.util.jar.Manifest( in );
+            java.util.jar.Manifest defaultManifest = new java.util.jar.Manifest( in );
 
-                defaultManifest.getMainAttributes().putValue( "Created-By",
-                                                              System.getProperty( "java.vm.version" ) + " ("
-                                                                  + System.getProperty( "java.vm.vendor" ) + ")" );
-                return defaultManifest;
-            }
-            finally
-            {
-                IOUtil.close( in );
-            }
+            in.close();
+            in = null;
+
+            defaultManifest.getMainAttributes().putValue( "Created-By",
+                                                          System.getProperty( "java.vm.version" ) + " ("
+                                                              + System.getProperty( "java.vm.vendor" ) + ")" );
+            return defaultManifest;
         }
         catch ( IOException e )
         {
             throw new ArchiverException( "Unable to read default manifest", e );
         }
+        finally
+        {
+            IOUtil.close( in );
+        }
     }
 
     public static void merge( java.util.jar.Manifest target, java.util.jar.Manifest other, boolean overwriteMain )
diff --git a/src/main/java/org/codehaus/plexus/archiver/jar/Manifest.java b/src/main/java/org/codehaus/plexus/archiver/jar/Manifest.java
@@ -25,7 +25,6 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
@@ -739,29 +738,29 @@ public Iterator<String> iterator()
     public static Manifest getDefaultManifest()
         throws ArchiverException
     {
+        InputStream in = null;
+        Reader reader = null;
+        final String defManifest = "/org/codehaus/plexus/archiver/jar/defaultManifest.mf";
         try
         {
-            String defManifest = "/org/codehaus/plexus/archiver/jar/defaultManifest.mf";
-            InputStream in = Manifest.class.getResourceAsStream( defManifest );
+            in = Manifest.class.getResourceAsStream( defManifest );
             if ( in == null )
             {
                 throw new ArchiverException( "Could not find default manifest: " + defManifest );
             }
-            try
-            {
-                Manifest defaultManifest = new Manifest( new InputStreamReader( in, "UTF-8" ) );
-                defaultManifest.getMainAttributes().putValue( "Created-By", System.getProperty(
-                    "java.vm.version" ) + " (" + System.getProperty( "java.vm.vendor" ) + ")" );
-                return defaultManifest;
-            }
-            catch ( UnsupportedEncodingException e )
-            {
-                return new Manifest( new InputStreamReader( in ) );
-            }
-            finally
-            {
-                IOUtil.close( in );
-            }
+            reader = new InputStreamReader( in, "UTF-8" );
+            final Manifest defaultManifest = new Manifest( reader );
+            defaultManifest.getMainAttributes().putValue( "Created-By", System.getProperty(
+                                                          "java.vm.version" ) + " (" + System.getProperty(
+                                                              "java.vm.vendor" ) + ")" );
+
+            reader.close();
+            reader = null;
+
+            in.close();
+            in = null;
+
+            return defaultManifest;
         }
         catch ( ManifestException e )
         {
@@ -771,6 +770,11 @@ public static Manifest getDefaultManifest()
         {
             throw new ArchiverException( "Unable to read default manifest", e );
         }
+        finally
+        {
+            IOUtil.close( in );
+            IOUtil.close( reader );
+        }
     }
 
     /**
diff --git a/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java b/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java
@@ -19,7 +19,6 @@
 
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.util.Compressor;
-import org.codehaus.plexus.util.IOUtil;
 import org.iq80.snappy.SnappyOutputStream;
 
 import java.io.IOException;
@@ -53,9 +52,20 @@ public void compress()
         }
     }
 
+    @Override
     public void close()
     {
-        IOUtil.close( zOut );
-        zOut = null;
+        try
+        {
+            if ( this.zOut != null )
+            {
+                this.zOut.close();
+                zOut = null;
+            }
+        }
+        catch ( final IOException e )
+        {
+            throw new ArchiverException( "Failure closing target.", e );
+        }
     }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
@@ -131,31 +131,30 @@ protected void execute()
 
         getLogger().info( "Building tar: " + tarFile.getAbsolutePath() );
 
-        final OutputStream os = new FileOutputStream( tarFile );
-        tOut = new TarArchiveOutputStream( compress( compression, os ), "UTF8" );
-        if ( longFileMode.isTruncateMode() )
-        {
-            tOut.setLongFileMode( TarArchiveOutputStream.LONGFILE_TRUNCATE );
-        }
-        else if ( longFileMode.isPosixMode() || longFileMode.isPosixWarnMode() )
-        {
-            tOut.setLongFileMode( TarArchiveOutputStream.LONGFILE_POSIX );
-            // Todo: Patch 2.5.1   for this fix. Also make closeable fix on 2.5.1
-            tOut.setBigNumberMode( TarArchiveOutputStream.BIGNUMBER_POSIX );
-        }
-        else if ( longFileMode.isFailMode() || longFileMode.isOmitMode() )
-        {
-            tOut.setLongFileMode( TarArchiveOutputStream.LONGFILE_ERROR );
-        }
-        else
-        {
-            // warn or GNU
-            tOut.setLongFileMode( TarArchiveOutputStream.LONGFILE_GNU );
-        }
-
-        longWarningGiven = false;
         try
         {
+            tOut = new TarArchiveOutputStream( compress( compression, new FileOutputStream( tarFile ) ), "UTF8" );
+            if ( longFileMode.isTruncateMode() )
+            {
+                tOut.setLongFileMode( TarArchiveOutputStream.LONGFILE_TRUNCATE );
+            }
+            else if ( longFileMode.isPosixMode() || longFileMode.isPosixWarnMode() )
+            {
+                tOut.setLongFileMode( TarArchiveOutputStream.LONGFILE_POSIX );
+                // Todo: Patch 2.5.1   for this fix. Also make closeable fix on 2.5.1
+                tOut.setBigNumberMode( TarArchiveOutputStream.BIGNUMBER_POSIX );
+            }
+            else if ( longFileMode.isFailMode() || longFileMode.isOmitMode() )
+            {
+                tOut.setLongFileMode( TarArchiveOutputStream.LONGFILE_ERROR );
+            }
+            else
+            {
+                // warn or GNU
+                tOut.setLongFileMode( TarArchiveOutputStream.LONGFILE_GNU );
+            }
+
+            longWarningGiven = false;
             while ( iter.hasNext() )
             {
                 ArchiveEntry entry = iter.next();
@@ -169,6 +168,8 @@ else if ( longFileMode.isFailMode() || longFileMode.isOmitMode() )
 
                 tarFile( entry, tOut, name );
             }
+
+            tOut.close();
         }
         finally
         {
@@ -496,13 +497,19 @@ protected void cleanUp()
         throws IOException
     {
         super.cleanUp();
-        IOUtil.close( tOut );
+        if ( this.tOut != null )
+        {
+            this.tOut.close();
+        }
     }
 
     protected void close()
         throws IOException
     {
-        IOUtil.close( tOut );
+        if ( this.tOut != null )
+        {
+            this.tOut.close();
+        }
     }
 
     protected String getArchiveType()
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
@@ -114,7 +114,8 @@ protected void execute( File sourceFile, File destDirectory )
 
             }
             getLogger().debug( "expand complete" );
-
+            tis.close();
+            tis = null;
         }
         catch ( IOException ioe )
         {
diff --git a/src/main/java/org/codehaus/plexus/archiver/util/Compressor.java b/src/main/java/org/codehaus/plexus/archiver/util/Compressor.java
@@ -94,10 +94,13 @@ private void compressFile( InputStream in, OutputStream zOut )
     protected void compress( PlexusIoResource resource, OutputStream zOut )
         throws IOException
     {
-        InputStream in = Streams.bufferedInputStream( resource.getContents() );
+        InputStream in = null;
         try
         {
+            in = Streams.bufferedInputStream( resource.getContents() );
             compressFile( in, zOut );
+            in.close();
+            in = null;
         }
         finally
         {
@@ -118,5 +121,6 @@ public abstract void compress()
      * 
      * this is public so the process of compression and closing can be dealt with separately.
      */
-    public abstract void close();
+    public abstract void close()
+        throws ArchiverException;
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/util/ResourceUtils.java b/src/main/java/org/codehaus/plexus/archiver/util/ResourceUtils.java
@@ -84,6 +84,10 @@ public static void copyFile( PlexusIoResource in, File outFile )
             input = in.getContents();
             output = new FileOutputStream( outFile );
             IOUtil.copy( input, output );
+            output.close();
+            output = null;
+            input.close();
+            input = null;
         }
         finally
         {
@@ -103,6 +107,10 @@ public static void copyFile( InputStream input, File outFile )
         {
             output = new FileOutputStream( outFile );
             IOUtil.copy( input, output );
+            output.close();
+            output = null;
+            input.close();
+            input = null;
         }
         finally
         {
diff --git a/src/main/java/org/codehaus/plexus/archiver/util/Streams.java b/src/main/java/org/codehaus/plexus/archiver/util/Streams.java
@@ -95,6 +95,12 @@ public static void copyFully( @WillClose InputStream zIn, @WillClose OutputStrea
         try
         {
             copyFullyDontCloseOutput( zIn, out, gzip );
+            out.close();
+            out = null;
+        }
+        catch ( final IOException e )
+        {
+            throw new ArchiverException( "Failure copying.", e );
         }
         finally
         {
@@ -125,6 +131,8 @@ public static void copyFullyDontCloseOutput( @WillClose InputStream zIn, @WillNo
                 count = zIn.read( buffer, 0, buffer.length );
             }
             while ( count != -1 );
+            zIn.close();
+            zIn = null;
         }
         catch ( IOException e )
         {
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
@@ -669,6 +669,8 @@ protected boolean createEmptyZip( File zipFile )
             empty[3] = 6;
             // remainder zeros
             os.write( empty );
+            os.close();
+            os = null;
         }
         catch ( IOException ioe )
         {
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java
diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java
diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarFileAttributesTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarFileAttributesTest.java
diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,8 @@ else if ( isDirectory )`
`313`	`313`	`out = new FileOutputStream( f );`
`314`	`314`
`315`	`315`	`IOUtil.copy( compressedInputStream, out );`
	`316`	`+ out.close();`
	`317`	`+ out = null;`
`316`	`318`	`}`
`317`	`319`	`finally`
`318`	`320`	`{`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,10 @@ private Manifest getManifest( File manifestFile )`
`204`	`204`	`try`
`205`	`205`	`{`
`206`	`206`	`in = new FileInputStream( manifestFile );`
`207`		`- return getManifest( in );`
	`207`	`+ final Manifest mf = getManifest( in );`
	`208`	`+ in.close();`
	`209`	`+ in = null;`
	`210`	`+ return mf;`
`208`	`211`	`}`
`209`	`212`	`catch ( IOException e )`
`210`	`213`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`
`20`	`20`	`import org.codehaus.plexus.archiver.ArchiverException;`
`21`	`21`	`import org.codehaus.plexus.archiver.util.Compressor;`
`22`		`-import org.codehaus.plexus.util.IOUtil;`
`23`	`22`	`import org.iq80.snappy.SnappyOutputStream;`
`24`	`23`
`25`	`24`	`import java.io.IOException;`
`@@ -53,9 +52,20 @@ public void compress()`
`53`	`52`	`}`
`54`	`53`	`}`
`55`	`54`
	`55`	`+ @Override`
`56`	`56`	`public void close()`
`57`	`57`	`{`
`58`		`- IOUtil.close( zOut );`
`59`		`- zOut = null;`
	`58`	`+ try`
	`59`	`+ {`
	`60`	`+ if ( this.zOut != null )`
	`61`	`+ {`
	`62`	`+ this.zOut.close();`
	`63`	`+ zOut = null;`
	`64`	`+ }`
	`65`	`+ }`
	`66`	`+ catch ( final IOException e )`
	`67`	`+ {`
	`68`	`+ throw new ArchiverException( "Failure closing target.", e );`
	`69`	`+ }`
`60`	`70`	`}`
`61`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,8 @@ protected void execute( File sourceFile, File destDirectory )`
`114`	`114`
`115`	`115`	`}`
`116`	`116`	`getLogger().debug( "expand complete" );`
`117`		`-`
	`117`	`+ tis.close();`
	`118`	`+ tis = null;`
`118`	`119`	`}`
`119`	`120`	`catch ( IOException ioe )`
`120`	`121`	`{`
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,13 @@ private void compressFile( InputStream in, OutputStream zOut )`
`94`	`94`	`protected void compress( PlexusIoResource resource, OutputStream zOut )`
`95`	`95`	`throws IOException`
`96`	`96`	`{`
`97`		`- InputStream in = Streams.bufferedInputStream( resource.getContents() );`
	`97`	`+ InputStream in = null;`
`98`	`98`	`try`
`99`	`99`	`{`
	`100`	`+ in = Streams.bufferedInputStream( resource.getContents() );`
`100`	`101`	`compressFile( in, zOut );`
	`102`	`+ in.close();`
	`103`	`+ in = null;`
`101`	`104`	`}`
`102`	`105`	`finally`
`103`	`106`	`{`
`@@ -118,5 +121,6 @@ public abstract void compress()`
`118`	`121`	`*`
`119`	`122`	`* this is public so the process of compression and closing can be dealt with separately.`
`120`	`123`	`*/`
`121`		`- public abstract void close();`
	`124`	`+ public abstract void close()`
	`125`	`+ throws ArchiverException;`
`122`	`126`	`}`