svn commit: r825415 - in /archiva/trunk/archiva-modules: archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/ archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/

[brett]

Author: brett
Date: Thu Oct 15 07:22:29 2009
New Revision: 825415

URL: http://svn.apache.org/viewvc?rev=825415&view=rev
Log:
[MNG-1264] make it clearer if the index gets into a bad state

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
    
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=825415&r1=825414&r2=825415&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
 Thu Oct 15 07:22:29 2009
@@ -147,6 +147,7 @@
         {
             log.error( "Error queueing task: " + task + ": " + e.getMessage(), 
e );
         }
+        context = null;
     }
 
     public List<String> getExcludes()

Modified: 
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java?rev=825415&r1=825414&r2=825415&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java
 Thu Oct 15 07:22:29 2009
@@ -115,6 +115,11 @@
             }
             else
             {
+                if ( context.getIndexDirectory() == null )
+                {
+                    throw new TaskExecutionException( "Trying to index an 
artifact but the context is already closed" );
+                }
+                
                 try
                 {
                     File artifactFile = indexingTask.getResourceFile();