Author: markt
Date: Thu May 19 12:45:49 2011
New Revision: 1124719
URL: http://svn.apache.org/viewvc?rev=1124719&view=rev
Log:
Remove unused isErrPage attribute
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1124719&r1=1124718&r2=1124719&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu May 19 12:45:49 2011
@@ -1160,7 +1160,7 @@ public class JspC implements Options {
String jspUri=file.replace('\\','/');
JspCompilationContext clctxt = new JspCompilationContext
- ( jspUri, false, this, context, null, rctxt );
+ ( jspUri, this, context, null, rctxt );
/* Override the defaults */
if ((targetClassName != null) && (targetClassName.length() > 0)) {
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1124719&r1=1124718&r2=1124719&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Thu May 19
12:45:49 2011
@@ -63,7 +63,6 @@ public class JspCompilationContext {
protected String className;
protected String jspUri;
- protected boolean isErrPage;
protected String basePackageName;
protected String derivedPackageName;
protected String servletJavaFileName;
@@ -95,14 +94,12 @@ public class JspCompilationContext {
// jspURI _must_ be relative to the context
public JspCompilationContext(String jspUri,
- boolean isErrPage,
Options options,
ServletContext context,
JspServletWrapper jsw,
JspRuntimeContext rctxt) {
this.jspUri = canonicalURI(jspUri);
- this.isErrPage = isErrPage;
this.options = options;
this.jsw = jsw;
this.context = context;
@@ -132,7 +129,7 @@ public class JspCompilationContext {
JspServletWrapper jsw,
JspRuntimeContext rctxt,
JarResource tagJarResource) {
- this(tagfile, false, options, context, jsw, rctxt);
+ this(tagfile, options, context, jsw, rctxt);
this.isTagFile = true;
this.tagInfo = tagInfo;
this.tagJarResource = tagJarResource;
@@ -385,18 +382,6 @@ public class JspCompilationContext {
return jspUri;
}
- /**
- * Are we processing something that has been declared as an
- * errorpage?
- */
- public boolean isErrorPage() {
- return isErrPage;
- }
-
- public void setErrorPage(boolean isErrPage) {
- this.isErrPage = isErrPage;
- }
-
public boolean isTagFile() {
return isTagFile;
}
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=1124719&r1=1124718&r2=1124719&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Thu May 19
12:45:49 2011
@@ -129,12 +129,12 @@ public class JspServlet extends HttpServ
AccessController.doPrivileged(new
PrivilegedExceptionAction<Object>(){
@Override
public Object run() throws IOException,
ServletException {
- serviceJspFile(null, null, jspFile, null, true);
+ serviceJspFile(null, null, jspFile, true);
return null;
}
});
} else {
- serviceJspFile(null, null, jspFile, null, true);
+ serviceJspFile(null, null, jspFile, true);
}
} catch (IOException e) {
throw new ServletException("Could not precompile jsp: " +
jspFile, e);
@@ -330,7 +330,7 @@ public class JspServlet extends HttpServ
try {
boolean precompile = preCompile(request);
- serviceJspFile(request, response, jspUri, null, precompile);
+ serviceJspFile(request, response, jspUri, precompile);
} catch (RuntimeException e) {
throw e;
} catch (ServletException e) {
@@ -364,7 +364,7 @@ public class JspServlet extends HttpServ
private void serviceJspFile(HttpServletRequest request,
HttpServletResponse response, String jspUri,
- Throwable exception, boolean precompile)
+ boolean precompile)
throws ServletException, IOException {
JspServletWrapper wrapper = rctxt.getWrapper(jspUri);
@@ -378,9 +378,8 @@ public class JspServlet extends HttpServ
handleMissingResource(request, response, jspUri);
return;
}
- boolean isErrorPage = exception != null;
wrapper = new JspServletWrapper(config, options, jspUri,
- isErrorPage, rctxt);
+ rctxt);
rctxt.addWrapper(jspUri,wrapper);
}
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1124719&r1=1124718&r2=1124719&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Thu May
19 12:45:49 2011
@@ -97,8 +97,8 @@ public class JspServletWrapper {
/*
* JspServletWrapper for JSP pages.
*/
- public JspServletWrapper(ServletConfig config, Options options, String
jspUri,
- boolean isErrorPage, JspRuntimeContext rctxt) {
+ public JspServletWrapper(ServletConfig config, Options options,
+ String jspUri, JspRuntimeContext rctxt) {
this.isTagFile = false;
this.config = config;
@@ -107,7 +107,7 @@ public class JspServletWrapper {
unloadByCount = options.getMaxLoadedJsps() > 0 ? true : false;
unloadByIdle = options.getJspIdleTimeout() > 0 ? true : false;
unloadAllowed = unloadByCount || unloadByIdle ? true : false;
- ctxt = new JspCompilationContext(jspUri, isErrorPage, options,
+ ctxt = new JspCompilationContext(jspUri, options,
config.getServletContext(),
this, rctxt);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
