-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
modified: appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/WebTest.java - Change AAsyncDispatchToC case to correctly match specified behavior. - Add BIncludeDispatchServletNamedDispatcher to combine include, async, and named dispatcher cases. - Add these tests to assertions. modified: appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml - Add BIncludeDispatchServletNamedDispatcher new file: appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java - combines include, async, and named dispatcher cases. modified: appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java - Dispatch async to ServletC rather than TestServlet. - Added logging. deleted: appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/TestServlet.java - No need for this. modified: appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java - The actual bug fix! If DispatcherType is ASYNC, overwrite the mapping reference with the one from the original request.
- Loading branch information
Showing
6 changed files
with
157 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
...ests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | ||
| * | ||
| * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * The contents of this file are subject to the terms of either the GNU | ||
| * General Public License Version 2 only ("GPL") or the Common Development | ||
| * and Distribution License("CDDL") (collectively, the "License"). You | ||
| * may not use this file except in compliance with the License. You can | ||
| * obtain a copy of the License at | ||
| * https://oss.oracle.com/licenses/CDDL+GPL-1.1 | ||
| * or LICENSE.txt. See the License for the specific | ||
| * language governing permissions and limitations under the License. | ||
| * | ||
| * When distributing the software, include this License Header Notice in each | ||
| * file and include the License file at LICENSE.txt. | ||
| * | ||
| * GPL Classpath Exception: | ||
| * Oracle designates this particular file as subject to the "Classpath" | ||
| * exception as provided by Oracle in the GPL Version 2 section of the License | ||
| * file that accompanied this code. | ||
| * | ||
| * Modifications: | ||
| * If applicable, add the following below the License Header, with the fields | ||
| * enclosed by brackets [] replaced by your own identifying information: | ||
| * "Portions Copyright [year] [name of copyright owner]" | ||
| * | ||
| * Contributor(s): | ||
| * If you wish your version of this file to be governed by only the CDDL or | ||
| * only the GPL Version 2, indicate your decision by adding "[Contributor] | ||
| * elects to include this software in this distribution under the [CDDL or GPL | ||
| * Version 2] license." If you don't indicate a single choice of license, a | ||
| * recipient has the option to distribute your version of this file under | ||
| * either the CDDL, the GPL Version 2 or to extend the choice of license to | ||
| * its licensees as provided above. However, if you add GPL Version 2 code | ||
| * and therefore, elected the GPL Version 2 license, then the option applies | ||
| * only if the new code is made subject to such option by the copyright | ||
| * holder. | ||
| */ | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.PrintWriter; | ||
| import javax.servlet.AsyncContext; | ||
| import javax.servlet.RequestDispatcher; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import javax.servlet.http.HttpServletMapping; | ||
|
|
||
| public class BIncludeDispatchServletNamedDispatcher extends HttpServlet { | ||
|
|
||
| /** | ||
| * Processes requests for both HTTP <code>GET</code> and <code>POST</code> | ||
| * methods. | ||
| * | ||
| * @param request servlet request | ||
| * @param response servlet response | ||
| * @throws ServletException if a servlet-specific error occurs | ||
| * @throws IOException if an I/O error occurs | ||
| */ | ||
| protected void processRequest(HttpServletRequest request, HttpServletResponse response) | ||
| throws ServletException, IOException { | ||
| request.getServletContext().log(this.getClass().getSimpleName() + " " | ||
| + request.getHttpServletMapping()); | ||
| HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING); | ||
| request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: " | ||
| + forwardMapping); | ||
| HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING); | ||
| request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: " | ||
| + includeMapping); | ||
| HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING); | ||
| request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: " | ||
| + asyncMapping); | ||
| RequestDispatcher rd = request.getServletContext().getNamedDispatcher("fa5raP"); | ||
| rd.include(request, response); | ||
| } | ||
|
|
||
| // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code."> | ||
| /** | ||
| * Handles the HTTP <code>GET</code> method. | ||
| * | ||
| * @param request servlet request | ||
| * @param response servlet response | ||
| * @throws ServletException if a servlet-specific error occurs | ||
| * @throws IOException if an I/O error occurs | ||
| */ | ||
| @Override | ||
| protected void doGet(HttpServletRequest request, HttpServletResponse response) | ||
| throws ServletException, IOException { | ||
| processRequest(request, response); | ||
| } | ||
|
|
||
| /** | ||
| * Handles the HTTP <code>POST</code> method. | ||
| * | ||
| * @param request servlet request | ||
| * @param response servlet response | ||
| * @throws ServletException if a servlet-specific error occurs | ||
| * @throws IOException if an I/O error occurs | ||
| */ | ||
| @Override | ||
| protected void doPost(HttpServletRequest request, HttpServletResponse response) | ||
| throws ServletException, IOException { | ||
| processRequest(request, response); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a short description of the servlet. | ||
| * | ||
| * @return a String containing servlet description | ||
| */ | ||
| @Override | ||
| public String getServletInfo() { | ||
| return "Short description"; | ||
| }// </editor-fold> | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 0 additions & 86 deletions
86
...er/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/TestServlet.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters