Author: hboutemy Date: Thu Jul 7 23:01:00 2011 New Revision: 1144089 URL: http://svn.apache.org/viewvc?rev=1144089&view=rev Log: use IOUtil.close() API to catch IOException in finally block
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java?rev=1144089&r1=1144088&r2=1144089&view=diff ============================================================================== --- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java (original) +++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java Thu Jul 7 23:01:00 2011 @@ -108,10 +108,7 @@ public class DefaultArchetypeManager } finally { - if ( zos != null ) - { - zos.close(); - } + IOUtil.close( zos ); } } @@ -149,10 +146,7 @@ public class DefaultArchetypeManager } finally { - if ( is != null ) - { - is.close(); - } + IOUtil.close( is ); } zos.flush(); Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java?rev=1144089&r1=1144088&r2=1144089&view=diff ============================================================================== --- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java (original) +++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java Thu Jul 7 23:01:00 2011 @@ -485,10 +485,7 @@ public class DefaultArchetypeArtifactMan } finally { - if (reader != null) - { - reader.close(); - } + IOUtil.close( reader ); } }