You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/11/04 19:29:41 UTC
svn commit: r1197703 -
/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
Author: olamy
Date: Fri Nov 4 18:29:41 2011
New Revision: 1197703
URL: http://svn.apache.org/viewvc?rev=1197703&view=rev
Log:
remove temporary indexes from indexer too
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java?rev=1197703&r1=1197702&r2=1197703&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java Fri Nov 4 18:29:41 2011
@@ -104,7 +104,7 @@ public class DefaultIndexMerger
IndexPackingRequest request = new IndexPackingRequest( indexingContext, indexLocation );
indexPacker.packIndex( request );
}
- temporaryIndexes.add( new TemporaryIndex( tempRepoFile ) );
+ temporaryIndexes.add( new TemporaryIndex( tempRepoFile, tempRepoId ) );
return indexingContext.getIndexDirectoryFile();
}
catch ( IOException e )
@@ -128,7 +128,15 @@ public class DefaultIndexMerger
{
try
{
- FileUtils.deleteDirectory( temporaryIndex.directory );
+ IndexingContext context = indexer.getIndexingContexts().get( temporaryIndex.indexId );
+ if ( context != null )
+ {
+ indexer.removeIndexingContext( context, true );
+ }
+ else
+ {
+ FileUtils.deleteDirectory( temporaryIndex.directory );
+ }
temporaryIndexes.remove( temporaryIndex );
log.debug( "remove directory {}", temporaryIndex.directory );
}
@@ -147,9 +155,12 @@ public class DefaultIndexMerger
private File directory;
- TemporaryIndex( File directory )
+ private String indexId;
+
+ TemporaryIndex( File directory, String indexId )
{
this.directory = directory;
+ this.indexId = indexId;
}
@Override