[lucene-solr] branch master updated: LUCENE-9068: Solr query handling code catches FuzzyTermsException

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

romseygeek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new 7ea7ed7  LUCENE-9068: Solr query handling code catches FuzzyTermsException
7ea7ed7 is described below

commit 7ea7ed72aca556f957a5de55911c852124db8715
Author: Alan Woodward <ro...@apache.org>
AuthorDate: Thu Jan 16 09:46:46 2020 +0000

    LUCENE-9068: Solr query handling code catches FuzzyTermsException
---
 .../java/org/apache/solr/handler/component/QueryComponent.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index a9d7d67..5da1fac 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -215,7 +215,7 @@ public class QueryComponent extends SearchComponent
           rb.setFilters( filters );
         }
       }
-    } catch (SyntaxError e) {
+    } catch (SyntaxError | FuzzyTermsEnum.FuzzyTermsException e) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
     }
 
@@ -1484,12 +1484,7 @@ public class QueryComponent extends SearchComponent
     SolrQueryResponse rsp = rb.rsp;
 
     SolrIndexSearcher searcher = req.getSearcher();
-
-    try {
-      searcher.search(result, cmd);
-    } catch (FuzzyTermsEnum.FuzzyTermsException e) {
-      throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
-    }
+    searcher.search(result, cmd);
     rb.setResult(result);
 
     ResultContext ctx = new BasicResultContext(rb);