You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/04/12 22:47:26 UTC
svn commit: r764324 - in /maven/mercury/trunk:
mercury-it/src/test/java/org/apache/maven/mercury/plexus/
mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/
mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/rep...
Author: bentmann
Date: Sun Apr 12 20:47:26 2009
New Revision: 764324
URL: http://svn.apache.org/viewvc?rev=764324&view=rev
Log:
o Fixed some file leaks
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (contents, props changed)
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=764324&r1=764323&r2=764324&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Sun Apr 12 20:47:26 2009
@@ -114,6 +114,7 @@
// prep. Artifact
File artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
+ artifactBinary.deleteOnExit();
FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), artifactBinary );
a = new DefaultArtifact( new ArtifactMetadata( "org.apache.maven.mercury:mercury-core:2.0.9" ) );
Propchange: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=764324&r1=764323&r2=764324&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java Sun Apr 12 20:47:26 2009
@@ -126,12 +126,14 @@
// }
artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
+ artifactBinary.deleteOnExit();
FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), artifactBinary );
binarySize = artifactBinary.length();
System.out.println( "Binary size is "+binarySize+" bytes" );
artifactPom = File.createTempFile( "test-repo-writer", "pom" );
+ artifactPom.deleteOnExit();
FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ), artifactPom );
pomSize = artifactPom.length();
pomBytes = FileUtil.readRawData( artifactPom );
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java?rev=764324&r1=764323&r2=764324&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java Sun Apr 12 20:47:26 2009
@@ -91,6 +91,7 @@
String prefix = "-t-";
String suffix = "-t";
File temp = File.createTempFile( prefix, suffix );
+ temp.delete();
DependencyProcessor dp = new MavenDependencyProcessor();
Credentials user = new Credentials("foo","bar");
@@ -108,6 +109,7 @@
_rr1 = new RemoteRepositoryM2( server, dp );
temp = File.createTempFile( prefix, suffix );
+ temp.delete();
_base2 = new File( "./target/webdav2" + temp.getName() );
// FileUtil.delete( _base2 );
assertFalse( _base2.exists() );
@@ -125,6 +127,7 @@
_rrs.add( _rr2 );
temp = File.createTempFile( prefix, suffix );
+ temp.delete();
_lbase1 = new File( _local1 + temp.getName() );
// FileUtil.delete( _lbase1 );
assertFalse( _lbase1.exists() );
@@ -133,6 +136,7 @@
_lr1 = new LocalRepositoryM2( "lr1", _lbase1, dp );
temp = File.createTempFile( prefix, suffix );
+ temp.delete();
_lbase2 = new File( _local2 + temp.getName() );
// FileUtil.delete( _lbase2 );
assertFalse( _lbase2.exists() );
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java?rev=764324&r1=764323&r2=764324&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java Sun Apr 12 20:47:26 2009
@@ -43,6 +43,7 @@
import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
import org.apache.maven.mercury.spi.http.server.HttpTestServer;
import org.apache.maven.mercury.transport.api.Server;
+import org.apache.maven.mercury.util.FileUtil;
/**
*
@@ -109,6 +110,7 @@
super.tearDown();
httpServer.stop();
httpServer.destroy();
+ FileUtil.delete( localRepoBase );
}
public void testOneArtifact()
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java?rev=764324&r1=764323&r2=764324&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java Sun Apr 12 20:47:26 2009
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import java.util.HashSet;
@@ -274,6 +275,17 @@
{
if( fLock != null )
fLock.release();
+ if ( in != null )
+ {
+ try
+ {
+ in.close();
+ }
+ catch ( IOException e )
+ {
+ // ignore, tried our best to clean up
+ }
+ }
}
}
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java?rev=764324&r1=764323&r2=764324&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java Sun Apr 12 20:47:26 2009
@@ -306,6 +306,17 @@
{
if( fLock != null )
fLock.release();
+ if ( in != null )
+ {
+ try
+ {
+ in.close();
+ }
+ catch ( IOException e )
+ {
+ // ignore, tried our best to clean up
+ }
+ }
}
}
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java?rev=764324&r1=764323&r2=764324&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java Sun Apr 12 20:47:26 2009
@@ -143,6 +143,10 @@
if ( _jetty != null )
{
}
+ if ( _vr != null )
+ {
+ _vr.close();
+ }
}
public void testReadSnapshot()