You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2008/12/08 12:57:43 UTC

svn commit: r724323 - in /maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia: macro/snippet/SnippetReader.java util/ByLineReaderSource.java

Author: vsiveton
Date: Mon Dec  8 03:57:42 2008
New Revision: 724323

URL: http://svn.apache.org/viewvc?rev=724323&view=rev
Log:
o using IOUtil.close()

Modified:
    maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
    maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java

Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java?rev=724323&r1=724322&r2=724323&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java Mon Dec  8 03:57:42 2008
@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.codehaus.plexus.util.IOUtil;
+
 /** Utility class for reading snippets. */
 public class SnippetReader
 {
@@ -147,7 +149,7 @@
         }
         finally
         {
-            reader.close();
+            IOUtil.close( reader );
         }
         return lines;
     }

Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java?rev=724323&r1=724322&r2=724323&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java Mon Dec  8 03:57:42 2008
@@ -21,7 +21,7 @@
 
 /*
  * Originally from org.apache.doxia.module.apt.AptReaderSource. It was modified
- * to get unget support 
+ * to get unget support
  */
 
 import java.io.IOException;
@@ -29,6 +29,7 @@
 import java.io.Reader;
 
 import org.apache.maven.doxia.parser.ParseException;
+import org.codehaus.plexus.util.IOUtil;
 
 /**
  * {@link ByLineSource} default implementation
@@ -122,17 +123,7 @@
     /** {@inheritDoc} */
     public final void close()
     {
-        if ( reader != null )
-        {
-            try
-            {
-                reader.close();
-            }
-            catch ( IOException ignored )
-            {
-                // ignore
-            }
-        }
+        IOUtil.close( reader );
         reader = null;
     }