Author: cstamas
Date: Wed Jun 8 15:34:56 2011
New Revision: 1133439
URL: http://svn.apache.org/viewvc?rev=1133439&view=rev
Log:
MINDEXER-26: fix for NPE
Modified:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
Modified:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
URL:
http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java?rev=1133439&r1=1133438&r2=1133439&view=diff
==============================================================================
---
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
(original)
+++
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
Wed Jun 8 15:34:56 2011
@@ -351,35 +351,38 @@ public class DefaultIndexingContext
private void deleteIndexFiles( boolean full )
throws IOException
{
- String[] names = indexDirectory.listAll();
-
- if ( names != null )
+ if ( indexDirectory != null )
{
- IndexFileNameFilter filter = IndexFileNameFilter.getFilter();
+ String[] names = indexDirectory.listAll();
- for ( int i = 0; i < names.length; i++ )
+ if ( names != null )
{
- if ( filter.accept( null, names[i] ) )
+ IndexFileNameFilter filter = IndexFileNameFilter.getFilter();
+
+ for ( int i = 0; i < names.length; i++ )
{
- indexDirectory.deleteFile( names[i] );
+ if ( filter.accept( null, names[i] ) )
+ {
+ indexDirectory.deleteFile( names[i] );
+ }
}
}
- }
- if ( full )
- {
- if ( indexDirectory.fileExists( INDEX_PACKER_PROPERTIES_FILE ) )
+ if ( full )
{
- indexDirectory.deleteFile( INDEX_PACKER_PROPERTIES_FILE );
- }
+ if ( indexDirectory.fileExists( INDEX_PACKER_PROPERTIES_FILE )
)
+ {
+ indexDirectory.deleteFile( INDEX_PACKER_PROPERTIES_FILE );
+ }
- if ( indexDirectory.fileExists( INDEX_UPDATER_PROPERTIES_FILE ) )
- {
- indexDirectory.deleteFile( INDEX_UPDATER_PROPERTIES_FILE );
+ if ( indexDirectory.fileExists( INDEX_UPDATER_PROPERTIES_FILE
) )
+ {
+ indexDirectory.deleteFile( INDEX_UPDATER_PROPERTIES_FILE );
+ }
}
- }
- IndexUtils.deleteTimestamp( indexDirectory );
+ IndexUtils.deleteTimestamp( indexDirectory );
+ }
}
public boolean isSearchable()
