This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new b38208e Remove duplicate error.jsp b38208e is described below commit b38208eb9a279a10d5be82623a299c14de203d45 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Nov 23 19:33:26 2021 +0000 Remove duplicate error.jsp --- test/org/apache/jasper/servlet/TestJspServlet.java | 2 +- test/webapp/WEB-INF/jsp/error.jsp | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/test/org/apache/jasper/servlet/TestJspServlet.java b/test/org/apache/jasper/servlet/TestJspServlet.java index 72964e2..8f71da1 100644 --- a/test/org/apache/jasper/servlet/TestJspServlet.java +++ b/test/org/apache/jasper/servlet/TestJspServlet.java @@ -53,7 +53,7 @@ public class TestJspServlet extends TomcatBaseTest { // PUT requests are normally blocked for JSPs ErrorPage ep = new ErrorPage(); ep.setErrorCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - ep.setLocation("/WEB-INF/jsp/error.jsp"); + ep.setLocation("/jsp/error.jsp"); context.addErrorPage(ep); tomcat.start(); diff --git a/test/webapp/WEB-INF/jsp/error.jsp b/test/webapp/WEB-INF/jsp/error.jsp deleted file mode 100644 index 3faef81..0000000 --- a/test/webapp/WEB-INF/jsp/error.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<%@page session="false" %> -<html> - <body> - <p>ERROR</p> - </body> -</html> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org