craigmcc 01/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 Changes Path
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.java 2001/07/13 01:50:55 1.32
+++ JspParseEventListener.java 2001/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("}");
