[lucene-solr] branch reference_impl updated: @228 - Fox config.

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/reference_impl by this push:
     new 5a4b2d5  @228 - Fox config.
5a4b2d5 is described below

commit 5a4b2d5285aa132dae47a15aea667e039e25df49
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Jul 17 22:42:51 2020 -0500

    @228 - Fox config.
---
 .../java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java | 4 +++-
 solr/webapp/web/WEB-INF/web.xml                                     | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 17cbdf6..99549ae 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -440,12 +440,14 @@ public class JettySolrRunner implements Closeable {
 
         qosFilter = root.getServletHandler().newFilterHolder(Source.EMBEDDED);
         qosFilter.setHeldClass(SolrQoSFilter.class);
+        qosFilter.setAsyncSupported(true);
         root.addFilter(qosFilter, "*", EnumSet.of(DispatcherType.REQUEST, DispatcherType.ASYNC));
 
         root.addServlet(Servlet404.class, "/*");
 
         // Map dispatchFilter in same path as in web.xml
-        root.addFilter(dispatchFilter, "*", EnumSet.of(DispatcherType.REQUEST));
+        dispatchFilter.setAsyncSupported(true);
+        root.addFilter(dispatchFilter, "*", EnumSet.of(DispatcherType.REQUEST, DispatcherType.ASYNC));
 
         log.info("Jetty loaded and ready to go");
         startLatch.countDown();
diff --git a/solr/webapp/web/WEB-INF/web.xml b/solr/webapp/web/WEB-INF/web.xml
index 64acbe0..938c2c0 100644
--- a/solr/webapp/web/WEB-INF/web.xml
+++ b/solr/webapp/web/WEB-INF/web.xml
@@ -25,12 +25,14 @@
   <filter>
     <filter-name>SolrQosFilter</filter-name>
     <filter-class>org.apache.solr.servlet.SolrQoSFilter</filter-class>
+    <async-supported>true</async-supported>
   </filter>
 
   <!-- Any path (name) registered in solrconfig.xml will be sent to that filter -->
   <filter>
     <filter-name>SolrRequestFilter</filter-name>
     <filter-class>org.apache.solr.servlet.SolrDispatchFilter</filter-class>
+    <async-supported>true</async-supported>
     <!--
     Exclude patterns is a list of directories that would be short circuited by the 
     SolrDispatchFilter. It includes all Admin UI related static content.
@@ -45,12 +47,14 @@
   <filter-mapping>
     <filter-name>SolrQosFilter</filter-name>
     <url-pattern>/*</url-pattern>
-    <dispatcher>REQUEST</dispatcher>
     <dispatcher>ASYNC</dispatcher>
+    <dispatcher>REQUEST</dispatcher>
   </filter-mapping>
   <filter-mapping>
     <filter-name>SolrRequestFilter</filter-name>
     <url-pattern>/*</url-pattern>
+    <dispatcher>ASYNC</dispatcher>
+    <dispatcher>REQUEST</dispatcher>
   </filter-mapping>
 
   <servlet>