Author: hboutemy
Date: Mon Sep 7 22:13:33 2009
New Revision: 812294
URL: http://svn.apache.org/viewvc?rev=812294&view=rev
Log:
use plexus IOUtil.close() API
Modified:
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/CsvReader.java
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
Modified:
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/CsvReader.java
URL:
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/CsvReader.java?rev=812294&r1=812293&r2=812294&view=diff
==============================================================================
---
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/CsvReader.java
(original)
+++
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/CsvReader.java
Mon Sep 7 22:13:33 2009
@@ -6,9 +6,9 @@
* copyright ownership. The ASF licenses this file to you under the Apache
License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
License. You may obtain a
* copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
* or implied. See the License for the specific language governing permissions
and limitations under
@@ -22,10 +22,11 @@
import java.util.List;
import org.apache.commons.csv.CSVParser;
+import org.codehaus.plexus.util.IOUtil;
/**
* Read a csv file with the synced repositories information
- *
+ *
* @author <a href="mailto:[email protected]";>Carlos Sanchez</a>
* @version $Id$
*/
@@ -83,14 +84,7 @@
}
finally
{
- try
- {
- reader.close();
- }
- catch ( IOException e )
- {
- // ignore
- }
+ IOUtil.close( reader );
}
}
Modified:
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
URL:
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java?rev=812294&r1=812293&r2=812294&view=diff
==============================================================================
---
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
(original)
+++
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
Mon Sep 7 22:13:33 2009
@@ -11,6 +11,7 @@
import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.SimpleEmail;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
@@ -213,13 +214,7 @@
}
finally
{
- try
- {
- is.close();
- }
- catch ( IOException e )
- {
- }
+ IOUtil.close( is );
}
if ( args.length == 3 )
Modified:
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
URL:
http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java?rev=812294&r1=812293&r2=812294&view=diff
==============================================================================
---
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
(original)
+++
maven/repository-tools/trunk/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
Mon Sep 7 22:13:33 2009
@@ -6,6 +6,8 @@
import java.io.IOException;
import java.util.Properties;
+import org.codehaus.plexus.util.IOUtil;
+
public class SynchronizerOptions
{
private static final String DRY_RUN = "dryRun";
@@ -106,13 +108,7 @@
}
finally
{
- try
- {
- is.close();
- }
- catch ( IOException e )
- {
- }
+ IOUtil.close( is );
}
SynchronizerOptions options = new SynchronizerOptions();
