You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2014/03/07 04:53:59 UTC
svn commit: r1575149 - in
/maven/indexer/branches/lucene-4.6/indexer-core/src:
main/java/org/apache/maven/index/ main/java/org/apache/maven/index/context/
main/java/org/apache/maven/index/incremental/
main/java/org/apache/maven/index/packer/ main/java/...
Author: olamy
Date: Fri Mar 7 03:53:58 2014
New Revision: 1575149
URL: http://svn.apache.org/r1575149
Log:
Handle null result for liveDocs if no document was deleted
Modified:
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java
maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java?rev=1575149&r1=1575148&r2=1575149&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java Fri Mar 7 03:53:58 2014
@@ -218,7 +218,7 @@ public class DefaultScannerListener
for ( int i = 0; i < r.maxDoc(); i++ )
{
- if ( liveDocs.get(i) )
+ if (liveDocs == null || liveDocs.get(i) )
{
Document d = r.document( i );
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java?rev=1575149&r1=1575148&r2=1575149&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java Fri Mar 7 03:53:58 2014
@@ -600,7 +600,7 @@ public class DefaultIndexingContext
Bits liveDocs = MultiFields.getLiveDocs(directoryReader);
for ( int i = 0; i < numDocs; i++ )
{
- if (! liveDocs.get(i) )
+ if (liveDocs != null && ! liveDocs.get(i) )
{
continue;
}
@@ -706,7 +706,7 @@ public class DefaultIndexingContext
for ( int i = 0; i < numDocs; i++ )
{
- if (! liveDocs.get(i) )
+ if (liveDocs != null && !liveDocs.get(i) )
{
continue;
}
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java?rev=1575149&r1=1575148&r2=1575149&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java Fri Mar 7 03:53:58 2014
@@ -155,7 +155,7 @@ public class DefaultIncrementalHandler
Bits liveDocs = MultiFields.getLiveDocs(r);
for ( int i = 0; i < r.maxDoc(); i++ )
{
- if ( liveDocs.get(i) )
+ if (liveDocs == null || liveDocs.get(i) )
{
Document d = r.document( i );
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java?rev=1575149&r1=1575148&r2=1575149&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java Fri Mar 7 03:53:58 2014
@@ -311,7 +311,7 @@ public class DefaultIndexPacker
for ( int i = 0; i < r.maxDoc(); i++ )
{
- if ( liveDocs.get(i) )
+ if ( liveDocs == null || liveDocs.get(i) )
{
w.addDocument( updateLegacyDocument( r.document( i ), context ) );
}
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java?rev=1575149&r1=1575148&r2=1575149&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java Fri Mar 7 03:53:58 2014
@@ -350,7 +350,7 @@ public class DefaultIndexUpdater
for ( int i = 0; i < r.maxDoc(); i++ )
{
- if ( liveDocs.get(i) )
+ if (liveDocs == null || liveDocs.get(i) )
{
w.addDocument( IndexUtils.updateDocument( r.document( i ), context ) );
}
@@ -384,7 +384,7 @@ public class DefaultIndexUpdater
for ( int i = 0; i < numDocs; i++ )
{
- if (! liveDocs.get(i) )
+ if (liveDocs != null && ! liveDocs.get(i) )
{
continue;
}
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java?rev=1575149&r1=1575148&r2=1575149&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java Fri Mar 7 03:53:58 2014
@@ -155,7 +155,7 @@ public class IndexDataWriter
{
for ( int i = 0; i < r.maxDoc(); i++ )
{
- if ( liveDocs.get(i) )
+ if (liveDocs == null || liveDocs.get(i) )
{
if ( writeDocument( r.document( i ) ) )
{
@@ -168,7 +168,7 @@ public class IndexDataWriter
{
for ( int i : docIndexes )
{
- if ( liveDocs.get(i) )
+ if ( liveDocs == null || liveDocs.get(i) )
{
if ( writeDocument( r.document( i ) ) )
{
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java?rev=1575149&r1=1575148&r2=1575149&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java Fri Mar 7 03:53:58 2014
@@ -526,7 +526,7 @@ public abstract class AbstractRepoNexusI
Bits liveDocs = MultiFields.getLiveDocs(reader);
for ( int i = 0; i < reader.maxDoc(); i++ )
{
- if ( liveDocs.get(i) )
+ if (liveDocs == null || liveDocs.get(i) )
{
Document document = reader.document( i );
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java?rev=1575149&r1=1575148&r2=1575149&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java Fri Mar 7 03:53:58 2014
@@ -51,7 +51,7 @@ public class Nexus737NexusIndexerTest
for ( int i = 0; i < reader.maxDoc(); i++ )
{
- if ( liveDocs.get(i) )
+ if (liveDocs == null || liveDocs.get(i) )
{
Document document = reader.document( i );