Revert TCK work around

Revert temporary fix for challenged TCK test (#5803)
jetty · Jan 5, 2021 · 7dfb44f · 7dfb44f
1 parent 51120b1
commit 7dfb44f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -2416,14 +2416,6 @@ ServletPathMapping findServletPathMapping()
     @Override
     public HttpServletMapping getHttpServletMapping()
     {
-        // TODO This is to pass the current TCK.  This has been challenged in https://github.com/eclipse-ee4j/jakartaee-tck/issues/585
-        if (_dispatcherType == DispatcherType.ASYNC)
-        {
-            Object async = getAttribute(AsyncContext.ASYNC_MAPPING);
-            if (async != null)
-                return (ServletPathMapping)async;
-        }
-
         // The mapping returned is normally for the current servlet.  Except during an
         // INCLUDE dispatch, in which case this method returns the mapping of the source servlet,
         // which we recover from the IncludeAttributes wrapper.

diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
@@ -477,8 +477,7 @@ public void testDispatchMapping() throws Exception
         _contextHandler.addServlet(new ServletHolder("DispatchServlet", AsyncDispatch2TestServlet.class), "/DispatchServlet");
 
         String response = _connector.getResponse("GET /context/DispatchServlet HTTP/1.0\n\n");
-        // TODO This is to pass the current TCK.  This has been challenged in https://github.com/eclipse-ee4j/jakartaee-tck/issues/585
-        assertThat(response, containsString("matchValue=DispatchServlet, pattern=/DispatchServlet, servletName=DispatchServlet, mappingMatch=EXACT"));
+        assertThat(response, containsString("matchValue=TestServlet, pattern=/TestServlet, servletName=TestServlet, mappingMatch=EXACT"));
     }
 
     public static class WrappingFilter implements Filter