commit 03a60231e8e8570f47d3a64de5c6f03c26e7379a
author Mike Drob <mdrob@apache.org> Thu May 07 17:47:03 2020 -0500
committer Mike Drob <mdrob@apache.org> Thu May 07 17:49:28 2020 -0500
tree f1ef6acbb2728db7ea90c3d6842a1a14c7f8136e
parent 726894f8c8a3ea46cd278dfb664c9f8494db188f

SOLR-14465: Solr query handling code catches FuzzyTermsException

This reverts commit 7ea7ed72aca556f957a5de55911c852124db8715.

solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java

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 b03997a..9f8b355 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 @@
           rb.setFilters( filters );
         }
       }
-    } catch (SyntaxError | FuzzyTermsEnum.FuzzyTermsException e) {
+    } catch (SyntaxError e) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
     }
 
@@ -1486,7 +1486,12 @@
     SolrQueryResponse rsp = rb.rsp;
 
     SolrIndexSearcher searcher = req.getSearcher();
-    searcher.search(result, cmd);
+
+    try {
+      searcher.search(result, cmd);
+    } catch (FuzzyTermsEnum.FuzzyTermsException e) {
+      throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
+    }
     rb.setResult(result);
 
     ResultContext ctx = new BasicResultContext(rb);