svn commit: r1179990 - /archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java

[olamy]

Author: olamy
Date: Fri Oct  7 10:39:59 2011
New Revision: 1179990

URL: http://svn.apache.org/viewvc?rev=1179990&view=rev
Log:
fix NPE in ArtifactLocator during scanning

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java?rev=1179990&r1=1179989&r2=1179990&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
 Fri Oct  7 10:39:59 2011
@@ -34,6 +34,9 @@ import org.apache.lucene.search.BooleanQ
 import org.apache.maven.index.ArtifactInfo;
 import org.apache.maven.index.FlatSearchRequest;
 import org.apache.maven.index.FlatSearchResponse;
+import org.apache.maven.index.GroupedSearchRequest;
+import org.apache.maven.index.Grouping;
+import org.apache.maven.index.IteratorSearchRequest;
 import org.apache.maven.index.MAVEN;
 import org.apache.maven.index.NexusIndexer;
 import org.apache.maven.index.OSGI;
@@ -235,8 +238,10 @@ public class NexusRepositorySearch
         {
             FlatSearchRequest request = new FlatSearchRequest( q );
             request.setContexts( getIndexingContexts( indexingContextIds ) );
+
             FlatSearchResponse response = indexer.searchFlat( request );
 
+
             if ( response == null || response.getTotalHits() == 0 )
             {
                 SearchResults results = new SearchResults();
@@ -590,7 +595,7 @@ public class NexusRepositorySearch
         return true;
     }
 
-    private SearchResults paginate( SearchResults results )
+    protected SearchResults paginate( SearchResults results )
     {
         SearchResultLimits limits = results.getLimits();
         SearchResults paginated = new SearchResults();