You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by lu...@apache.org on 2003/02/06 00:39:21 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler ErrorDispatcher.java Generator.java JspConfig.java
luehe 2003/02/05 15:39:21
Modified: jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java Generator.java JspConfig.java
Log:
Undid changes that were not supposed to be committed with previous putback
Revision Changes Path
1.11 +3 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
Index: ErrorDispatcher.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ErrorDispatcher.java 5 Feb 2003 23:35:21 -0000 1.10
+++ ErrorDispatcher.java 5 Feb 2003 23:39:20 -0000 1.11
@@ -303,7 +303,6 @@
*/
public void javacError(String errMsg, String fname, Node.Nodes page)
throws JasperException, IOException {
- System.out.println("LLL: " + errMsg);
JavacErrorDetail[] errDetails = parseJavacMessage(errMsg, fname, page);
errHandler.javacError(errDetails);
}
1.160 +3 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- Generator.java 5 Feb 2003 23:35:21 -0000 1.159
+++ Generator.java 5 Feb 2003 23:39:20 -0000 1.160
@@ -3123,8 +3123,6 @@
out.printil( " throw (java.io.IOException) t;" );
out.printil( "if( t instanceof javax.servlet.jsp.JspException )" );
out.printil( " throw (javax.servlet.jsp.JspException) t;" );
- out.printil( "if( t instanceof IllegalArgumentException )" );
- out.printil( " throw (IllegalArgumentException) t;" );
out.printil("throw new javax.servlet.jsp.JspException(t);" );
out.popIndent();
out.printil( "} finally {" );
1.8 +4 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java
Index: JspConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JspConfig.java 5 Feb 2003 23:35:21 -0000 1.7
+++ JspConfig.java 5 Feb 2003 23:39:21 -0000 1.8
@@ -208,7 +208,7 @@
}
/**
- * Find a property that best matches the supplied resource.
+ * Find a property that best match the supplied resource.
* @param uri the resource supplied.
* @return a JspProperty if a match is found, null otherwise
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org