diff options
| author | Henri Yandell <bayard@apache.org> | 2006-12-02 00:37:00 +0000 |
|---|---|---|
| committer | Henri Yandell <bayard@apache.org> | 2006-12-02 00:37:00 +0000 |
| commit | 5484a753336fc790ce70a7a6d1fb4b532798fc36 (patch) | |
| tree | 98cc867e6ecb908afaaddb9c1da1bacb154f29b0 /archiva-proxy | |
| parent | 08b6a8f7b6cf609b0cb3615b12fa754dcba90675 (diff) | |
| download | archiva-5484a753336fc790ce70a7a6d1fb4b532798fc36.tar.gz archiva-5484a753336fc790ce70a7a6d1fb4b532798fc36.zip | |
Moving from Plexus Utils IOUtil to Commons IO IOUtils. close(..) becomes closeQuietly(..). copy(..) stays the same. In 1.3 (we're on 1.2 currently) copy(..) will throw an exception if more than MAXINT bytes are copied, but this is just a test case so I think we're safe.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@481460 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-proxy')
| -rw-r--r-- | archiva-proxy/pom.xml | 4 | ||||
| -rw-r--r-- | archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/archiva-proxy/pom.xml b/archiva-proxy/pom.xml index 4f7f03f4b..8301da78c 100644 --- a/archiva-proxy/pom.xml +++ b/archiva-proxy/pom.xml @@ -53,5 +53,9 @@ <version>1.2_Java1.3</version> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> </dependencies> </project> diff --git a/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java b/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java index e0242794e..8d7eff60b 100644 --- a/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java +++ b/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java @@ -42,7 +42,7 @@ import org.codehaus.plexus.digest.DigestUtils; import org.codehaus.plexus.digest.DigesterException; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.IOUtil; +import org.apache.commons.io.IOUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; @@ -407,7 +407,7 @@ public class DefaultProxyRequestHandler } finally { - IOUtil.close( fileReader ); + IOUtils.closeQuietly( fileReader ); } } @@ -440,7 +440,7 @@ public class DefaultProxyRequestHandler } finally { - IOUtil.close( fileReader ); + IOUtils.closeQuietly( fileReader ); } if ( changed ) @@ -457,7 +457,7 @@ public class DefaultProxyRequestHandler } finally { - IOUtil.close( fileWriter ); + IOUtils.closeQuietly( fileWriter ); } } } |