include the bytecode index to the searcheables in searchForTerm(..) instead of just searching it if the file content search returned

nothing


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@676854 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 5 deletions

diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
index 469ff679b..a2c813a19 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
@@ -123,6 +123,8 @@ public class DefaultCrossRepositorySearch
     public SearchResults searchForTerm( String principal, List<String> selectedRepos, String term, SearchResultLimits limits )
     {
         List<RepositoryContentIndex> indexes = getFileContentIndexes( principal, selectedRepos );
+        List<RepositoryContentIndex> bytecodeIndices = getBytecodeIndexes( principal, selectedRepos );        
+        indexes.addAll( bytecodeIndices );
 
         try
         {
@@ -131,11 +133,6 @@ public class DefaultCrossRepositorySearch
             SearchResults results = searchAll( query, limits, indexes );
             results.getRepositories().addAll( this.localIndexedRepositories );
             
-            if( results.getTotalHits() == 0 )
-            {
-                results = searchForBytecode( principal, selectedRepos, term, limits );             
-            }
-
             return results;
         }
         catch ( ParseException e )