Author: epunzalan
Date: Sun Jan 29 18:51:46 2006
New Revision: 373417
URL: http://svn.apache.org/viewcvs?rev=373417&view=rev
Log:
Submitted by: Maria Odea Ching
Addresses code concerns raised by brett in the dev mailing list.
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java?rev=373417&r1=373416&r2=373417&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
Sun Jan 29 18:51:46 2006
@@ -216,7 +216,7 @@
}
finally
{
- indexReader.close();
+ if ( indexReader != null ) indexReader.close();
}
}
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java?rev=373417&r1=373416&r2=373417&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
Sun Jan 29 18:51:46 2006
@@ -81,7 +81,7 @@
}
catch ( RepositoryIndexException e )
{
- // expected
+ assertTrue ( true );
}
try
@@ -93,7 +93,7 @@
}
catch ( RepositoryIndexException e )
{
- // expected
+ assertTrue ( true );
}
ArtifactRepositoryIndex indexer =
factory.createArtifactRepositoryIndex( indexPath, repository );
@@ -104,7 +104,7 @@
}
catch ( RepositoryIndexException e )
{
- // expected
+ assertTrue ( true );
}
}
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java?rev=373417&r1=373416&r2=373417&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java
Sun Jan 29 18:51:46 2006
@@ -38,6 +38,7 @@
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.IOException;
import java.net.URL;
import java.util.Iterator;
import java.util.List;
@@ -222,9 +223,9 @@
indexer.optimize();
indexer.close();
}
- catch ( Exception e )
+ catch ( RepositoryIndexException e )
{
- //expected
+ assertTrue ( true );
}
try
@@ -232,9 +233,13 @@
indexer.isIndexed( new Object() );
fail( "Must throw exception when the passed object is not of type
metadata." );
}
- catch ( Exception e )
+ catch ( RepositoryIndexException e )
{
- //expected
+ assertTrue ( true );
+ }
+ catch ( IOException ie )
+ {
+ fail ( "Unexpected IOException thrown: + " + ie.getMessage() );
}
}
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java?rev=373417&r1=373416&r2=373417&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java
Sun Jan 29 18:51:46 2006
@@ -37,6 +37,7 @@
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -85,7 +86,7 @@
}
catch ( RepositoryIndexException e )
{
- // expected
+ assertTrue ( true );
}
try
@@ -97,7 +98,7 @@
}
catch ( RepositoryIndexException e )
{
- // expected
+ assertTrue ( true );
}
PomRepositoryIndex indexer = factory.createPomRepositoryIndex(
indexPath, repository );
@@ -106,9 +107,13 @@
indexer.isIndexed( new Object() );
fail( "Must throw exception when the passed object is not of type
model." );
}
- catch ( Exception e )
+ catch ( RepositoryIndexException e )
+ {
+ assertTrue ( true );
+ }
+ catch ( IOException ie )
{
- //expected
+ fail ( "Unexpected IOException thrown: " + ie.getMessage() );
}
}
