You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/04/23 13:04:17 UTC
svn commit: r1675574 - in /tomcat/trunk/java/org/apache/jasper:
Constants.java servlet/JspServlet.java
Author: markt
Date: Thu Apr 23 11:04:17 2015
New Revision: 1675574
URL: http://svn.apache.org/r1675574
Log:
Remove deprecated JSP_FILE code
Modified:
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=1675574&r1=1675573&r2=1675574&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Thu Apr 23 11:04:17 2015
@@ -65,19 +65,6 @@ public class Constants {
System.getProperty("org.apache.jasper.Constants.SERVLET_CLASSPATH", "org.apache.catalina.jsp_classpath");
/**
- * Request attribute for <code><jsp-file></code> element of a
- * servlet definition. If present on a request, this overrides the
- * value returned by <code>request.getServletPath()</code> to select
- * the JSP page to be executed.
- * @deprecated This will be removed in Tomcat 9.0.x onwards. It is replaced
- * by the use of the jspFile servlet initialisation parameter
- */
- @Deprecated
- public static final String JSP_FILE =
- System.getProperty("org.apache.jasper.Constants.JSP_FILE", "org.apache.catalina.jsp_file");
-
-
- /**
* Default size of the JSP buffer.
*/
public static final int DEFAULT_BUFFER_SIZE = 8 * 1024;
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1675574&r1=1675573&r2=1675574&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Thu Apr 23 11:04:17 2015
@@ -276,25 +276,14 @@ public class JspServlet extends HttpServ
}
- @SuppressWarnings("deprecation") // Use of JSP_FILE to be removed in 9.0.x
@Override
- public void service (HttpServletRequest request,
- HttpServletResponse response)
- throws ServletException, IOException {
+ public void service (HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
- //jspFile may be configured as an init-param for this servlet instance
+ // jspFile may be configured as an init-param for this servlet instance
String jspUri = jspFile;
if (jspUri == null) {
- // JSP specified via <jsp-file> in <servlet> declaration and
- // supplied through custom servlet container code
- String jspFile = (String) request.getAttribute(Constants.JSP_FILE);
- if (jspFile != null) {
- jspUri = jspFile;
- request.removeAttribute(Constants.JSP_FILE);
- }
- }
- if (jspUri == null) {
/*
* Check to see if the requested JSP has been the target of a
* RequestDispatcher.include()
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org