You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/07/29 21:26:26 UTC
svn commit: r680808 -
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
Author: vsiveton
Date: Tue Jul 29 12:26:25 2008
New Revision: 680808
URL: http://svn.apache.org/viewvc?rev=680808&view=rev
Log:
o close the stream
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=680808&r1=680807&r2=680808&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java Tue Jul 29 12:26:25 2008
@@ -911,23 +911,33 @@
}
List classes = new ArrayList();
- JarInputStream jarStream = new JarInputStream( new FileInputStream( jarFile ) );
- JarEntry jarEntry = jarStream.getNextJarEntry();
- while ( jarEntry != null )
+ JarInputStream jarStream = null;
+
+ try
{
- if ( jarEntry == null )
+ jarStream = new JarInputStream( new FileInputStream( jarFile ) );
+ JarEntry jarEntry = jarStream.getNextJarEntry();
+ while ( jarEntry != null )
{
- break;
- }
+ if ( jarEntry == null )
+ {
+ break;
+ }
- if ( jarEntry.getName().toLowerCase( Locale.ENGLISH ).endsWith( ".class" ) )
- {
- String name = jarEntry.getName().substring( 0, jarEntry.getName().indexOf( "." ) );
+ if ( jarEntry.getName().toLowerCase( Locale.ENGLISH ).endsWith( ".class" ) )
+ {
+ String name = jarEntry.getName().substring( 0, jarEntry.getName().indexOf( "." ) );
- classes.add( name.replaceAll( "/", "\\." ) );
- }
+ classes.add( name.replaceAll( "/", "\\." ) );
+ }
- jarEntry = jarStream.getNextJarEntry();
+ jarStream.closeEntry();
+ jarEntry = jarStream.getNextJarEntry();
+ }
+ }
+ finally
+ {
+ IOUtil.close( jarStream );
}
return classes;