Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove temporary indexes from indexer too 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197703 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-11-04 18:29:41 +00:00
parent 392019d186
commit 48314e4daa
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
View File

@ -104,7 +104,7 @@ public class DefaultIndexMerger
IndexPackingRequest request = new IndexPackingRequest( indexingContext, indexLocation ); IndexPackingRequest request = new IndexPackingRequest( indexingContext, indexLocation );
indexPacker.packIndex( request ); indexPacker.packIndex( request );
} }
temporaryIndexes.add( new TemporaryIndex( tempRepoFile ) ); temporaryIndexes.add( new TemporaryIndex( tempRepoFile, tempRepoId ) );
return indexingContext.getIndexDirectoryFile(); return indexingContext.getIndexDirectoryFile();
} }
catch ( IOException e ) catch ( IOException e )
@ -128,7 +128,15 @@ public class DefaultIndexMerger
{ {
try 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 ); temporaryIndexes.remove( temporaryIndex );
log.debug( "remove directory {}", temporaryIndex.directory ); log.debug( "remove directory {}", temporaryIndex.directory );
} }
@ -147,9 +155,12 @@ public class DefaultIndexMerger
private File directory; private File directory;
TemporaryIndex( File directory ) private String indexId;
TemporaryIndex( File directory, String indexId )
{ {
this.directory = directory; this.directory = directory;
this.indexId = indexId;
} }
@Override @Override