cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
larryi 01/12/03 18:47:03 Modified:jasper/src/share/org/apache/jasper/compiler Tag: tomcat_40_branch JspParseEventListener.java Log: Eliminated use of hard coded '\n' line separator Revision ChangesPath No revision No revision 1.33.2.3 +10 -10 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java Index: JspParseEventListener.java === RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v retrieving revision 1.33.2.2 retrieving revision 1.33.2.3 diff -u -r1.33.2.2 -r1.33.2.3 --- JspParseEventListener.java2001/11/02 20:24:23 1.33.2.2 +++ JspParseEventListener.java2001/12/04 02:47:03 1.33.2.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.33.2.2 2001/11/02 20:24:23 kinman Exp $ - * $Revision: 1.33.2.2 $ - * $Date: 2001/11/02 20:24:23 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.33.2.3 2001/12/04 02:47:03 larryi Exp $ + * $Revision: 1.33.2.3 $ + * $Date: 2001/12/04 02:47:03 $ * * * @@ -354,13 +354,13 @@ writer.println(response.setContentType(\ + servletContentType + ;charset=ISO-8859-1\);); - writer.println(pageContext = _jspxFactory.getPageContext(this, request, response,\n - + \t\t\t - + writer.quoteString(error) + , - + genSessionVariable + , - + bufferSize + , - + autoFlush - + );); + writer.println(pageContext = _jspxFactory.getPageContext(this, request, response,); + writer.println(\t\t\t + + writer.quoteString(error) + , + + genSessionVariable + , + + bufferSize + , + + autoFlush + + );); writer.println(); writer.println(application = pageContext.getServletContext();); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
larryi 01/12/03 18:49:05 Modified:jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java Log: Eliminated use of hard coded '\n' line separator Revision ChangesPath 1.36 +10 -10 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java Index: JspParseEventListener.java === RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- JspParseEventListener.java2001/11/02 19:36:09 1.35 +++ JspParseEventListener.java2001/12/04 02:49:05 1.36 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.35 2001/11/02 19:36:09 kinman Exp $ - * $Revision: 1.35 $ - * $Date: 2001/11/02 19:36:09 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.36 2001/12/04 02:49:05 larryi Exp $ + * $Revision: 1.36 $ + * $Date: 2001/12/04 02:49:05 $ * * * @@ -354,13 +354,13 @@ writer.println(response.setContentType(\ + servletContentType + ;charset=ISO-8859-1\);); - writer.println(pageContext = _jspxFactory.getPageContext(this, request, response,\n - + \t\t\t - + writer.quoteString(error) + , - + genSessionVariable + , - + bufferSize + , - + autoFlush - + );); + writer.println(pageContext = _jspxFactory.getPageContext(this, request, response,); + writer.println(\t\t\t + + writer.quoteString(error) + , + + genSessionVariable + , + + bufferSize + , + + autoFlush + + );); writer.println(); writer.println(application = pageContext.getServletContext();); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
kinman 01/11/02 11:36:09
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
Log:
PR: 4550
Fixed a bug involving multiple import attributes in page directives.
Revision ChangesPath
1.35 +7 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- JspParseEventListener.java2001/10/03 21:48:30 1.34
+++ JspParseEventListener.java2001/11/02 19:36:09 1.35
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.34 2001/10/03 21:48:30 kinman Exp $
- * $Revision: 1.34 $
- * $Date: 2001/10/03 21:48:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.35 2001/11/02 19:36:09 kinman Exp $
+ * $Revision: 1.35 $
+ * $Date: 2001/11/02 19:36:09 $
*
*
*
@@ -736,7 +736,10 @@
for(int i = 0; i pdhis.length; i++) {
PageDirectiveHandlerInfo pdhi = pdhis[i];
if (attr.equals(pdhi.attribute)) {
-String value = (String) attrs.getValue(pdhi.attribute);
+ // Retrieve the attribute keyed by index, not by name,
+ // to handle page directives, where multiple import
+ // attributes may be specified
+ String value = attrs.getValue(j);
pdhi.handler.handlePageDirectiveAttribute(this, value,
start, stop);
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
kinman 01/11/02 12:24:23
Modified:jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch JspParseEventListener.java
Log:
PR: 4550
Fixed a bug involving multiple import attributes in page directives.
Revision ChangesPath
No revision
No revision
1.33.2.2 +7 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -r1.33.2.1 -r1.33.2.2
--- JspParseEventListener.java2001/10/03 22:00:33 1.33.2.1
+++ JspParseEventListener.java2001/11/02 20:24:23 1.33.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.33.2.1 2001/10/03 22:00:33 kinman Exp $
- * $Revision: 1.33.2.1 $
- * $Date: 2001/10/03 22:00:33 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.33.2.2 2001/11/02 20:24:23 kinman Exp $
+ * $Revision: 1.33.2.2 $
+ * $Date: 2001/11/02 20:24:23 $
*
*
*
@@ -736,7 +736,10 @@
for(int i = 0; i pdhis.length; i++) {
PageDirectiveHandlerInfo pdhi = pdhis[i];
if (attr.equals(pdhi.attribute)) {
-String value = (String) attrs.getValue(pdhi.attribute);
+ // Retrieve the attribute keyed by index, not by name,
+ // to handle page directives, where multiple import
+ // attributes may be specified
+ String value = attrs.getValue(j);
pdhi.handler.handlePageDirectiveAttribute(this, value,
start, stop);
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java StoredCharDataGenerator.java
craigmcc01/07/24 18:08:13
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
StoredCharDataGenerator.java
Log:
Correct the pathname of the file in which the template text is stored when
the largefile initialization parameter (of the JSP servlet) is set to
true. In addition, modify the generated code to account for the fact
that java.io.* is no longer implicitly imported.
PR: Bugzilla #2748
Submitted by: Vincente Salvador [EMAIL PROTECTED]
Revision ChangesPath
1.33 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- JspParseEventListener.java2001/07/13 01:50:55 1.32
+++ JspParseEventListener.java2001/07/25 01:08:13 1.33
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.32 2001/07/13 01:50:55 remm Exp $
- * $Revision: 1.32 $
- * $Date: 2001/07/13 01:50:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.33 2001/07/25 01:08:13 craigmcc Exp $
+ * $Revision: 1.33 $
+ * $Date: 2001/07/25 01:08:13 $
*
*
*
@@ -182,7 +182,7 @@
// FIXME: Is this good enough? (I'm just taking the easy way out - akv)
if (ctxt.getOptions().getLargeFile())
-dataFile = ctxt.getOutputDir() + File.separatorChar +
+dataFile = ctxt.getOutputDir() +
ctxt.getServletClassName() + .dat;
}
1.2 +8 -8
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/StoredCharDataGenerator.java
Index: StoredCharDataGenerator.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/StoredCharDataGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StoredCharDataGenerator.java 2000/08/12 00:52:08 1.1
+++ StoredCharDataGenerator.java 2001/07/25 01:08:13 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/StoredCharDataGenerator.java,v
1.1 2000/08/12 00:52:08 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/StoredCharDataGenerator.java,v
1.2 2001/07/25 01:08:13 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/07/25 01:08:13 $
*
*
*
@@ -97,23 +97,23 @@
private final void generateInit(ServletWriter writer) {
if (stringId == 0) {
String name = writer.quoteString(fileName);
-writer.println(ObjectInputStream oin = null;);
+writer.println(java.io.ObjectInputStream oin = null;);
writer.println(int numStrings = 0;);
writer.println(try {);
writer.pushIndent();
-writer.println(FileInputStream fin = new FileInputStream(+name+););
-writer.println(oin = new ObjectInputStream(fin););
+writer.println(java.io.FileInputStream fin = new
java.io.FileInputStream(+name+););
+writer.println(oin = new java.io.ObjectInputStream(fin););
writer.println(_jspx_html_data = (char[][]) oin.readObject(););
writer.popIndent();
writer.println(} catch (Exception ex) {);
writer.pushIndent();
-writer.println(throw new JasperException(\Unable to open data
file\););
+writer.println(throw new
org.apache.jasper.runtime.JspException(\Unable to open data file\););
writer.popIndent();
writer.println(} finally {);
writer.pushIndent();
writer.println(if (oin != null));
writer.pushIndent();
-writer.println(try { oin.close(); } catch (IOException ignore) { });
+writer.println(try { oin.close(); } catch (java.io.IOException ignore)
{ });
writer.popIndent();
writer.popIndent();
writer.println(});
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
remm01/07/12 18:50:57
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
Log:
- Generate code with JspException instead of JasperException, which fixes
an instantiation problem when running with a security manager.
Revision ChangesPath
1.32 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JspParseEventListener.java2001/07/10 23:50:26 1.31
+++ JspParseEventListener.java2001/07/13 01:50:55 1.32
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.31 2001/07/10 23:50:26 horwat Exp $
- * $Revision: 1.31 $
- * $Date: 2001/07/10 23:50:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.32 2001/07/13 01:50:55 remm Exp $
+ * $Revision: 1.32 $
+ * $Date: 2001/07/13 01:50:55 $
*
*
*
@@ -296,7 +296,7 @@
writer.println(private static boolean _jspx_inited = false;);
writer.println();
-writer.println(public final void _jspx_init() throws
org.apache.jasper.JasperException {);
+writer.println(public final void _jspx_init() throws
org.apache.jasper.runtime.JspException {);
writer.pushIndent();
generateAll(InitMethodPhase.class);
writer.popIndent();
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java XmlOutputter.java
horwat 01/05/22 14:43:37
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java XmlOutputter.java
Log:
Fix the syntax generated by XmlOutputter. Properly check and close an element with
no body.
Bugzilla #1819
Revision ChangesPath
1.30 +11 -11
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JspParseEventListener.java2001/04/27 18:09:29 1.29
+++ JspParseEventListener.java2001/05/22 21:43:29 1.30
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.29 2001/04/27 18:09:29 craigmcc Exp $
- * $Revision: 1.29 $
- * $Date: 2001/04/27 18:09:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.30 2001/05/22 21:43:29 horwat Exp $
+ * $Revision: 1.30 $
+ * $Date: 2001/05/22 21:43:29 $
*
*
*
@@ -786,7 +786,7 @@
}
else if (!directive.equals(include)) {
- xo.append(jsp:directive. + directive, attrs);
+ xo.append(jsp:directive. + directive, attrs, true);
}
}
@@ -882,7 +882,7 @@
genSessionVariable, isXml),
start, stop);
addGenerator(gen);
-xo.append(jsp:useBean, attrs);
+xo.append(jsp:useBean, attrs, false);
}
public void handleBeanEnd(Mark start, Mark stop, Attributes attrs)
@@ -904,7 +904,7 @@
beanInfo), start, stop);
addGenerator(gen);
- xo.append(jsp:getProperty, attrs);
+ xo.append(jsp:getProperty, attrs, true);
}
public void handleSetProperty(Mark start, Mark stop, Attributes attrs)
@@ -922,7 +922,7 @@
new SetPropertyGenerator(start, stop, attrs, beanInfo, isXml),
start, stop);
addGenerator(gen);
-xo.append(jsp:setProperty, attrs);
+xo.append(jsp:setProperty, attrs, true);
}
public void handlePlugin(Mark start, Mark stop, Attributes attrs,
@@ -960,7 +960,7 @@
new ForwardGenerator(start, attrs, param, isXml),
start, stop);
addGenerator(gen);
- xo.append(jsp:forward, attrs);
+ xo.append(jsp:forward, attrs, false);
xo.append(jsp:param, param);
xo.append(jsp:forward);
}
@@ -981,7 +981,7 @@
new IncludeGenerator(start, attrs, param, isXml),
start, stop);
addGenerator(gen);
- xo.append(jsp:include, attrs);
+ xo.append(jsp:include, attrs, false);
xo.append(jsp:param, param);
xo.append(jsp:include);
}
@@ -1026,7 +1026,7 @@
getTagVarNumbers(), hasBody, isXml);
Generator gen = new GeneratorWrapper(tbg, start, stop);
addGenerator(gen);
-xo.append(prefix+:+shortTagName, attrs);
+xo.append(prefix+:+shortTagName, attrs, false);
}
public void handleTagEnd(Mark start, Mark stop, String prefix,
@@ -1080,7 +1080,7 @@
new UninterpretedTagBeginGenerator(rawName, attrs);
Generator genWrapper = new GeneratorWrapper(gen, start, stop);
addGenerator(genWrapper);
-xo.append(rawName, attrs);
+xo.append(rawName, attrs, false);
}
public void handleUninterpretedTagEnd(Mark start, Mark stop,
1.14 +15 -11
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java
Index: XmlOutputter.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XmlOutputter.java 2001/04/27 18:09:32 1.13
+++ XmlOutputter.java 2001/05/22 21:43:32 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.13 2001/04/27 18:09:32 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2001/04/27 18:09:32 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.14 2001/05/22 21:43:32 horwat Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/05/22 21:43:32 $
*
*
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java ParserController.java
horwat 01/04/09 16:38:12
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java ParserController.java
Log:
Change default character encoding to: ISO-8859-1
Bugzilla #1181
Revision ChangesPath
1.24 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JspParseEventListener.java2001/03/27 23:56:24 1.23
+++ JspParseEventListener.java2001/04/09 23:38:12 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.23 2001/03/27 23:56:24 horwat Exp $
- * $Revision: 1.23 $
- * $Date: 2001/03/27 23:56:24 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.24 2001/04/09 23:38:12 horwat Exp $
+ * $Revision: 1.24 $
+ * $Date: 2001/04/09 23:38:12 $
*
*
*
@@ -352,7 +352,7 @@
else
writer.println("response.setContentType(\"" +
servletContentType +
-";charset=8859_1\");");
+";charset=ISO-8859-1\");");
writer.println("pageContext = _jspxFactory.getPageContext(this, request,
response,\n"
+ "\t\t\t"
+ writer.quoteString(error) + ", "
1.14 +2 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java
Index: ParserController.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ParserController.java 2001/03/21 00:27:01 1.13
+++ ParserController.java 2001/04/09 23:38:12 1.14
@@ -122,9 +122,9 @@
/*
* The encoding of the "top" file. This encoding is used
* for included files by default.
- * Defaults to "8859_1" per JSP spec.
+ * Defaults to "ISO-8859-1" per JSP spec.
*/
-private String topFileEncoding = "8859_1";
+private String topFileEncoding = "ISO-8859-1";
/*
* The 'new' encoding required to read a page.
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
horwat 01/03/27 15:56:24
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
Log:
Handle empty element case. This patch allows jasper to work with xerces-1.3.0
Revision ChangesPath
1.23 +7 -5
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JspParseEventListener.java2001/02/04 01:05:13 1.22
+++ JspParseEventListener.java2001/03/27 23:56:24 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.22 2001/02/04 01:05:13 glenn Exp $
- * $Revision: 1.22 $
- * $Date: 2001/02/04 01:05:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.23 2001/03/27 23:56:24 horwat Exp $
+ * $Revision: 1.23 $
+ * $Date: 2001/03/27 23:56:24 $
*
*
*
@@ -1097,8 +1097,10 @@
public void handleJspCdata(Mark start, Mark stop, char[] data)
throws JasperException
{
- handleCharData(start, stop, data);
-xo.append("jsp:cdata", null, data);
+ if (data != null) {
+ handleCharData(start, stop, data);
+xo.append("jsp:cdata", null, data);
+ }
}
/**
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
glenn 01/02/03 17:05:13
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
Log:
- Implemented Java SecurityManager
- Switched to using URLClassLoader
Jasper now creates a URLClassLoader for each JSP page and defers any other
class loading to the web app context class loader. Using a single class
loader per JSP allowed me to remove all the code that increments the
class version number, i.e. the work directory no longer has multiple
*.java and *.class files for the same JSP page. These changes also made
it easy for me to put the java source and class files in the same directory
tree as found in the web app context. When Jasper is run in a servlet
container it no longer puts the class files in a package, they are now
in the default package.
Revision ChangesPath
1.22 +8 -10
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JspParseEventListener.java2001/01/24 20:26:39 1.21
+++ JspParseEventListener.java2001/02/04 01:05:13 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.21 2001/01/24 20:26:39 horwat Exp $
- * $Revision: 1.21 $
- * $Date: 2001/01/24 20:26:39 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.22 2001/02/04 01:05:13 glenn Exp $
+ * $Revision: 1.22 $
+ * $Date: 2001/02/04 01:05:13 $
*
*
*
@@ -182,7 +182,6 @@
// FIXME: Is this good enough? (I'm just taking the easy way out - akv)
if (ctxt.getOptions().getLargeFile())
dataFile = ctxt.getOutputDir() + File.separatorChar +
-ctxt.getServletPackageName() + "_" +
ctxt.getServletClassName() + ".dat";
}
@@ -235,7 +234,6 @@
}
private void generateAll(Class phase) throws JasperException {
-
for(int i = 0; i generators.size(); i++) {
Generator gen = (Generator) generators.elementAt(i);
if (phase.isInstance(gen)) {
@@ -248,11 +246,11 @@
private void generateHeader() throws JasperException {
String servletPackageName = ctxt.getServletPackageName();
String servletClassName = ctxt.getServletClassName();
- // First the package name:
- if (! "".equals(servletPackageName) servletPackageName != null) {
- writer.println("package "+servletPackageName+";");
- writer.println();
- }
+// First the package name:
+if (! "".equals(servletPackageName) servletPackageName != null) {
+writer.println("package "+servletPackageName+";");
+writer.println();
+}
Enumeration e = imports.elements();
while (e.hasMoreElements())
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
horwat 01/01/24 12:26:39
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
Log:
Fix _jspx_init() thread safety
BR 157
Revision ChangesPath
1.21 +11 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JspParseEventListener.java2000/12/22 18:37:39 1.20
+++ JspParseEventListener.java2001/01/24 20:26:39 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.20 2000/12/22 18:37:39 pierred Exp $
- * $Revision: 1.20 $
- * $Date: 2000/12/22 18:37:39 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.21 2001/01/24 20:26:39 horwat Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/01/24 20:26:39 $
*
*
*
@@ -333,8 +333,16 @@
writer.println();
writer.println("if (_jspx_inited == false) {");
writer.pushIndent();
+ writer.println("synchronized (this) {");
+writer.pushIndent();
+writer.println("if (_jspx_inited == false) {");
+writer.pushIndent();
writer.println("_jspx_init();");
writer.println("_jspx_inited = true;");
+writer.popIndent();
+writer.println("}");
+writer.popIndent();
+writer.println("}");
writer.popIndent();
writer.println("}");
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java ParserController.java
pierred 00/12/22 10:37:40
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java ParserController.java
Log:
Fix for Bug #55.
-
Synopsis:
Default for included files is 8859_1, with no option to set otherwise.
Report Description:
The default for reading an included file is ISO_8859_1. We can,
of course, set pageConent to read UTF-8 (which is what we need it
to be to support international
code). Unfortunately, when there are two or more levels of
encoding (or the pageContent type ins't set), the encoding that
the JspReader gets set to a hard-coded
"ISO_8859_1", and doesn't allow this to be set to anything else
via the runtime system properties. In:
org.apache.jasper.compiler.JspReader JspReader.java line
158, encoding ALWAYS defaults to 8859_1, and the file.encoding,
when set from the System properties. This is an easy fix, to set
encoding to: encoding =
System.getPropert("file.encoding","8859_1") ; The result,
typically, is that the file will flake out and convert all of the
non-UTF-8 characters to US-ASCII, @%, etc.
-
I'm not sure I fully understand what's described there,
so here is what I believe should be done.
The "encoding" for a JSP file is currently handled as follows:
1. In Compiler.java, we create a JspReader for the top-level
("including") jsp file using the 8859_1 encoding.
2. Using that JspReader, we check if there is a page directive
with 'contentType' specified. If there is, then
a new JspReader for the page is created with the encoding set to the
"charset" specified in the contentType value of the page
directive; otherwise we stick with the default 8859_1 encoding.
3. When a page is included, JspReader.pushFile() is called,
and the encoding passed as argument appears to always
be null (since no encoding attribute can be specified in
the "include" directive, reading 'encoding' off of the
attributes appears to be a bug in JspParseEventListener).
Because it is null, it always defaults to 8859_1.
If I understand well the intent of the bug report, we'd need the
following modifications:
- In step 2, if contentType is not specified in the "including" page,
set the encoding to be:
encoding = System.getProperty("file.encoding", "8859_1");
This means that the default encoding of all JSP files at a site could
be defined globally using system property "file.encoding".
I don't think this is spec-compliant, and would be reluctant
to make that change.
-- Change not done
Comments from Hans Bergsten
"I agree that using "file.encoding" as the ultimate default is not
spec compliant. I suggest you stick to the current behavior, with
"8859_1" if contentType doesn't specify a charset."
- In step 3, use the encoding of the "including" page.
This would fix what I believe is a bug in the current implementation.
-- Change done
Submitted by: [EMAIL PROTECTED]
Revision ChangesPath
1.20 +4 -6
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JspParseEventListener.java2000/12/21 23:16:41 1.19
+++ JspParseEventListener.java2000/12/22 18:37:39 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.19 2000/12/21 23:16:41 pierred Exp $
- * $Revision: 1.19 $
- * $Date: 2000/12/21 23:16:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.20 2000/12/22 18:37:39 pierred Exp $
+ * $Revision: 1.20 $
+ * $Date: 2000/12/22 18:37:39 $
*
*
*
@@ -750,8 +750,6 @@
if (directive.equals("include")) {
String file = attrs.getValue("file");
- String encoding = attrs.getValue("encoding");
-
if (file == null)
throw new CompileException(start,
Constants.getString("jsp.error.include.missing.file"));
@@ -766,7 +764,7 @@
}
*/
try {
- parserCtl.parse(file, encoding);
+ parserCtl.parse(file);
} catch (FileNotFoundException ex) {
throw new CompileException(
start,
1.9
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java TagLibraryInfoImpl.java XmlOutputter.java
pierred 00/12/08 12:45:19
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java TagLibraryInfoImpl.java
XmlOutputter.java
Log:
Misc bug fixes for XML syntax processing.
Revision ChangesPath
1.16 +9 -6
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JspParseEventListener.java2000/12/05 12:23:46 1.15
+++ JspParseEventListener.java2000/12/08 20:45:09 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.15 2000/12/05 12:23:46 pierred Exp $
- * $Revision: 1.15 $
- * $Date: 2000/12/05 12:23:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.16 2000/12/08 20:45:09 pierred Exp $
+ * $Revision: 1.16 $
+ * $Date: 2000/12/08 20:45:09 $
*
*
*
@@ -777,7 +777,9 @@
ex.getMessage());
}
}
- xo.append("jsp:directive." + directive, attrs);
+ if (!directive.equals("include")) {
+ xo.append("jsp:directive." + directive, attrs);
+ }
}
@@ -988,7 +990,6 @@
start, stop);
addGenerator(gen);
-xo.append(chars);
}
public void handleTagBegin(Mark start, Mark stop,
@@ -1034,7 +1035,7 @@
}
public void handleRootEnd() {
- xo.append("jsp:root");
+ xo.rootEnd();
}
public void handleRootBegin(Attributes attrs)
@@ -1076,6 +1077,7 @@
{
if (data != null) {
handleCharData(start, stop, data);
+xo.append(data);
}
UninterpretedTagEndGenerator gen =
new UninterpretedTagEndGenerator(rawName);
@@ -1088,6 +1090,7 @@
throws JasperException
{
handleCharData(start, stop, data);
+xo.append("jsp:cdata", null, data);
}
/**
1.16 +7 -9
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TagLibraryInfoImpl.java 2000/11/18 22:36:48 1.15
+++ TagLibraryInfoImpl.java 2000/12/08 20:45:12 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.15 2000/11/18 22:36:48 pierred Exp $
- * $Revision: 1.15 $
- * $Date: 2000/11/18 22:36:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.16 2000/12/08 20:45:12 pierred Exp $
+ * $Revision: 1.16 $
+ * $Date: 2000/12/08 20:45:12 $
*
* The Apache Software License, Version 1.1
*
@@ -180,8 +180,6 @@
URL url = null;
boolean relativeURL = false;
- //p("prefix: " + prefix + " uriIn: " + uriIn);
- //if (location != null) p("location: " + location[0]);
if (location == null) {
// The URI points to the TLD itself or to a jar
// file where the TLD is located
@@ -215,23 +213,19 @@
parseTLD(location[0], in);
} else {
// Location points to a jar file
- // p("JAR FILE: " + location[0]);
// tag library in jar file
JarFile jarFile = null;
ZipEntry jarEntry = null;
InputStream stream = null;
try {
url = ctxt.getResource(location[0]);
- // p("url = " + url);
if (url == null) return;
url = new URL("jar:" + url.toString() + "!/");
JarURLConnection conn =
(JarURLConnection) url.openConnection();
conn.connect(); //@@@ necessary???
jarFile = conn.getJarFile();
- // p("jarFile: " + jarFile);
jarEntry = jarFile.getEntry(location[1]);
- // p("jarEntry name: " + jarEntry.getName());
stream = jarFile.getInputStream(jarEntry);
parseTLD(location[0], stream);
// FIXME @@@
@@ -240,6 +234,10 @@
// it to
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java XmlOutputter.java
pierred 00/12/08 16:36:11
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java XmlOutputter.java
Log:
Added proper handling of jsp:include and jsp:forward
tags when generating the XML stream for validation by tag
libraries.
Revision ChangesPath
1.17 +9 -5
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JspParseEventListener.java2000/12/08 20:45:09 1.16
+++ JspParseEventListener.java2000/12/09 00:36:10 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.16 2000/12/08 20:45:09 pierred Exp $
- * $Revision: 1.16 $
- * $Date: 2000/12/08 20:45:09 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.17 2000/12/09 00:36:10 pierred Exp $
+ * $Revision: 1.17 $
+ * $Date: 2000/12/09 00:36:10 $
*
*
*
@@ -952,7 +952,9 @@
new ForwardGenerator(start, attrs, param, isXml),
start, stop);
addGenerator(gen);
- //@@@ xo
+ xo.append("jsp:forward", attrs);
+ xo.append("jsp:param", param);
+ xo.append("jsp:forward");
}
public void handleInclude(Mark start, Mark stop, Attributes attrs,
@@ -971,7 +973,9 @@
new IncludeGenerator(start, attrs, param, isXml),
start, stop);
addGenerator(gen);
- //@@@ xo
+ xo.append("jsp:include", attrs);
+ xo.append("jsp:param", param);
+ xo.append("jsp:include");
}
public void handleCharData(Mark start, Mark stop, char[] chars) throws
JasperException {
1.6 +20 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java
Index: XmlOutputter.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XmlOutputter.java 2000/12/08 20:45:13 1.5
+++ XmlOutputter.java 2000/12/09 00:36:10 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.5 2000/12/08 20:45:13 pierred Exp $
- * $Revision: 1.5 $
- * $Date: 2000/12/08 20:45:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
1.6 2000/12/09 00:36:10 pierred Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/12/09 00:36:10 $
*
*
*
@@ -153,6 +153,23 @@
*/
void append(String tag, Attributes attrs) {
append(tag, attrs, sb);
+}
+
+/**
+ * Append the start tag along with its attributes
+ * (name, value) to the XML stream.
+ */
+void append(String tag, Hashtable table) {
+ Enumeration enum = table.keys();
+ while (enum.hasMoreElements()) {
+ String name = (String)enum.nextElement();
+ String value = ((String[])table.get(name))[0];
+ AttributesImpl attrs = new AttributesImpl();
+ attrs.addAttribute("", "name", "name", "CDATA", name);
+ attrs.addAttribute("", "value", "value", "CDATA", value);
+ append(tag, attrs, sb);
+ append(tag);
+ }
}
/**
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
pierred 00/12/05 04:23:53
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
Log:
Ooops... last fix broke tag libraries handling (was only processed
for XML syntax). Things now back to normal.
Revision ChangesPath
1.15 +32 -14
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JspParseEventListener.java2000/12/05 11:05:19 1.14
+++ JspParseEventListener.java2000/12/05 12:23:46 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.14 2000/12/05 11:05:19 pierred Exp $
- * $Revision: 1.14 $
- * $Date: 2000/12/05 11:05:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.15 2000/12/05 12:23:46 pierred Exp $
+ * $Revision: 1.15 $
+ * $Date: 2000/12/05 12:23:46 $
*
*
*
@@ -742,6 +742,12 @@
throw new CompileException(start, Constants.getString(
"jsp.error.page.bad_b_and_a_combo"));
+ if (directive.equals("taglib")) {
+ String uri = attrs.getValue("uri");
+ String prefix = attrs.getValue("prefix");
+processTaglibDirective(uri, prefix);
+}
+
if (directive.equals("include")) {
String file = attrs.getValue("file");
String encoding = attrs.getValue("encoding");
@@ -1041,20 +1047,12 @@
String prefix = qName.substring(6);
if (!prefix.equals("jsp")) {
String uri = attrs.getValue(i);
- System.out.println("prefix: " + prefix);
- System.out.println("uri: " + uri);
+ //System.out.println("prefix: " + prefix);
+ //System.out.println("uri: " + uri);
if (uri.startsWith("urn:jsptld:")) {
uri = uri.substring(11);
- }
- TagLibraryInfo tl = null;
- String[] location =
- ctxt.getTldLocation(uri);
- if (location == null) {
- tl = new TagLibraryInfoImpl(ctxt, prefix, uri);
- } else {
- tl = new TagLibraryInfoImpl(ctxt, prefix, uri, location);
}
- libraries.addTagLibrary(prefix, tl);
+ processTaglibDirective(uri, prefix);
}
}
}
@@ -1109,5 +1107,25 @@
new Object[]{tli.getShortName(), msg}));
}
}
+}
+
+/**
+ * Process a taglib directive. This can happen either via the
+ * JSP taglib directive (in JSP syntax) or via xmlns in jsp:root
+ * (in XML syntax).
+ */
+private void processTaglibDirective(String uri, String prefix)
+ throws JasperException
+{
+ TagLibraryInfo tl = null;
+
+ String[] location =
+ ctxt.getTldLocation(uri);
+ if (location == null) {
+ tl = new TagLibraryInfoImpl(ctxt, prefix, uri);
+ } else {
+ tl = new TagLibraryInfoImpl(ctxt, prefix, uri, location);
+ }
+ libraries.addTagLibrary(prefix, tl);
}
}
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
pierred 00/11/26 08:17:35
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
Log:
As per JSP1.2, generated servlet now catches Throwable instead
of Exception, and calls PageContext.handlePageException(Throwable).
Submitted by: "Rob Saccoccio" [EMAIL PROTECTED]
Revision ChangesPath
1.12 +5 -6
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JspParseEventListener.java2000/11/06 20:52:26 1.11
+++ JspParseEventListener.java2000/11/26 16:17:34 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.11 2000/11/06 20:52:26 pierred Exp $
- * $Revision: 1.11 $
- * $Date: 2000/11/06 20:52:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.12 2000/11/26 16:17:34 pierred Exp $
+ * $Revision: 1.12 $
+ * $Date: 2000/11/26 16:17:34 $
*
*
*
@@ -356,14 +356,13 @@
private void generateFooter() throws JasperException {
writer.popIndent();
- //writer.println("} catch (Throwable t) {");
- writer.println("} catch (Exception ex) {");
+ writer.println("} catch (Throwable t) {");
writer.pushIndent();
writer.println("if (out.getBufferSize() != 0)");
writer.pushIndent();
writer.println("out.clearBuffer();");
writer.popIndent();
- writer.println("pageContext.handlePageException(ex);");
+ writer.println("pageContext.handlePageException(t);");
writer.popIndent();
writer.println("} finally {");
writer.pushIndent();
