Issue #12725 reset match indexes for FilterMappings on setFilterMappings

Author: janbartel

jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java

@@ -1395,6 +1395,8 @@ public void setFilterMappings(FilterMapping[] filterMappings)
             if (isRunning())
                 updateMappings();
             invalidateChainsCache();
+            _matchBeforeIndex = -1;
+            _matchAfterIndex = -1;
         }
     }
 

jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletHandlerTest.java

@@ -42,6 +42,7 @@
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -850,6 +851,48 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
         assertThat(connector.getResponse("GET /other.bob HTTP/1.0\r\n\r\n"), containsString("path-/*-path-*.bob-default"));
     }
 
+    @Test
+    public void testFilterMappingsResetAfterStart() throws Exception
+    {
+        Server server = new Server();
+        ServletContextHandler context = new ServletContextHandler("/");
+        server.setHandler(context);
+
+        ServletHandler handler = context.getServletHandler();
+        List<FilterHolder> filterHolders = new ArrayList<>();
+        fh1.setFilter(new SomeFilter());
+        fh2.setFilter(new SomeFilter());
+        fh3.setFilter(new SomeFilter());
+        filterHolders.add(fh1);
+        filterHolders.add(fh2);
+        List<FilterMapping> filterMappings = new ArrayList<>();
+        filterMappings.add(fm1);
+        filterMappings.add(fm2);
+
+        handler.setFilters(filterHolders.toArray(
+            new FilterHolder[filterHolders.size()]
+        ));
+        handler.setFilterMappings(filterMappings.toArray(
+            new FilterMapping[filterMappings.size()]
+        ));
+
+        handler.addFilter(fh3, fm3);
+
+        server.start();
+
+        context.stop();
+
+        assertDoesNotThrow(() ->
+        {
+            handler.setFilters(null);
+            handler.setFilterMappings(null);
+            handler.addFilter(fh1, fm1);
+            handler.addFilter(fh2, fm2);
+            handler.addFilter(fh3, fm3);
+            context.start();
+        });
+    }
+
     @Test
     public void testDurable() throws Exception
     {