[tomcat] branch main updated: Remove hack required to pass TCK. Test was successfully challenged.

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 51d08d6  Remove hack required to pass TCK. Test was successfully 
challenged.
51d08d6 is described below

commit 51d08d659a3df16328f089ace4362dff96949dcd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 7 15:23:11 2021 +0100

    Remove hack required to pass TCK. Test was successfully challenged.
    
    https://github.com/eclipse-ee4j/servlet-api/issues/385
    also
    https://github.com/eclipse-ee4j/servlet-api/issues/309
---
 java/org/apache/catalina/core/ApplicationDispatcher.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 7175449..a87d8ad 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -607,9 +607,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
             wrequest.setQueryString(queryString);
             wrequest.setQueryParams(queryString);
         }
-        if (!Globals.STRICT_SERVLET_COMPLIANCE) {
-            wrequest.setMapping(mapping);
-        }
+        wrequest.setMapping(mapping);
 
         invoke(state.outerRequest, state.outerResponse, state);
     }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org