From 940e56f246a848ae72f6d8d3f0a20cf80844df66 Mon Sep 17 00:00:00 2001
From: "Edwin L. Punzalan" <epunzalan@apache.org>
Date: Mon, 30 Jan 2006 02:51:46 +0000
Subject: [PATCH] Submitted by: Maria Odea Ching

Addresses code concerns raised by brett in the dev mailing list.

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@373417 13f79535-47bb-0310-9956-ffa450edef68
---
 .../indexing/AbstractRepositoryIndex.java           |  2 +-
 .../indexing/ArtifactRepositoryIndexingTest.java    |  6 +++---
 .../indexing/MetadataRepositoryIndexingTest.java    | 13 +++++++++----
 .../indexing/PomRepositoryIndexingTest.java         | 13 +++++++++----
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java b/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
index 49d83dcf5..fed1e6547 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
+++ b/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
@@ -216,7 +216,7 @@ public abstract class AbstractRepositoryIndex
         }
         finally
         {
-            indexReader.close();
+            if ( indexReader != null ) indexReader.close();
         }
     }
 
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java b/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
index e75491b07..271e9c28e 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
+++ b/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
@@ -81,7 +81,7 @@ public class ArtifactRepositoryIndexingTest
         }
         catch ( RepositoryIndexException e )
         {
-            // expected
+            assertTrue ( true );
         }
 
         try
@@ -93,7 +93,7 @@ public class ArtifactRepositoryIndexingTest
         }
         catch ( RepositoryIndexException e )
         {
-            // expected
+            assertTrue ( true );
         }
 
         ArtifactRepositoryIndex indexer = factory.createArtifactRepositoryIndex( indexPath, repository );
@@ -104,7 +104,7 @@ public class ArtifactRepositoryIndexingTest
         }
         catch ( RepositoryIndexException e )
         {
-            // expected
+            assertTrue ( true );
         }
     }
 
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java b/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java
index 2eeb6e9ae..97bea7b9f 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java
+++ b/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/MetadataRepositoryIndexingTest.java
@@ -38,6 +38,7 @@ import org.codehaus.plexus.util.FileUtils;
 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 @@ public class MetadataRepositoryIndexingTest
             indexer.optimize();
             indexer.close();
         }
-        catch ( Exception e )
+        catch ( RepositoryIndexException e )
         {
-            //expected
+            assertTrue ( true );
         }
 
         try
@@ -232,9 +233,13 @@ public class MetadataRepositoryIndexingTest
             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() );
         }
     }
 
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java b/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java
index 612901a9a..73b83b626 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java
+++ b/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/PomRepositoryIndexingTest.java
@@ -37,6 +37,7 @@ import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 import java.io.FileReader;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
@@ -85,7 +86,7 @@ public class PomRepositoryIndexingTest
         }
         catch ( RepositoryIndexException e )
         {
-            // expected
+            assertTrue ( true );
         }
 
         try
@@ -97,7 +98,7 @@ public class PomRepositoryIndexingTest
         }
         catch ( RepositoryIndexException e )
         {
-            // expected
+            assertTrue ( true );
         }
 
         PomRepositoryIndex indexer = factory.createPomRepositoryIndex( indexPath, repository );
@@ -106,9 +107,13 @@ public class PomRepositoryIndexingTest
             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() );
         }
     }
 
-- 
2.39.5