nacho 01/03/09 21:16:51
Modified: src/share/org/apache/jasper/compiler Tag: tomcat_32
IncludeGenerator.java
Log:
Fix for Bug#284
<jsp:include> error message is not descriptive BugRat Report#529
Submitted by : [EMAIL PROTECTED] (Arun Katkere)
Revision Changes Path
No revision
No revision
1.4.2.3 +19 -19
jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java
Index: IncludeGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- IncludeGenerator.java 2000/12/19 23:44:40 1.4.2.2
+++ IncludeGenerator.java 2001/03/10 05:16:50 1.4.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
1.4.2.2 2000/12/19 23:44:40 pierred Exp $
- * $Revision: 1.4.2.2 $
- * $Date: 2000/12/19 23:44:40 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
1.4.2.3 2001/03/10 05:16:50 nacho Exp $
+ * $Revision: 1.4.2.3 $
+ * $Date: 2001/03/10 05:16:50 $
*
* ====================================================================
*
@@ -88,29 +88,29 @@
boolean isExpression = false;
Hashtable params;
- public IncludeGenerator(Mark start, Hashtable attrs, Hashtable param)
- throws JasperException
- {
- if (attrs.size() != 2)
- throw new CompileException(start,
- Constants.getString("jsp.error.include.tag"));
-
+ public IncludeGenerator(Mark start, Hashtable attrs, Hashtable param )
+ throws JasperException {
page = (String) attrs.get("page");
- if (page == null)
- throw new CompileException(start,
- Constants.getString("jsp.error.include.tag"));
-
+ if (page == null){
+ throw new CompileException(start,
+ Constants.getString("jsp.error.include.tag"));
+ }
String flush = (String) attrs.get("flush");
- if (flush == null)
+ if (flush == null){
throw new CompileException(start,
Constants.getString("jsp.error.include.noflush"));
-
- if (!flush.equals("true"))
+ }
+ if (!flush.equals("true")){
throw new CompileException(start,
Constants.getString("jsp.error.include.badflush"));
+ }
+ if (attrs.size() != 2){
+ throw new CompileException(start,
+ Constants.getString("jsp.error.include.tag"));
+ }
- this.params = param;
- isExpression = JspUtil.isExpression (page);
+ this.params = param;
+ isExpression = JspUtil.isExpression (page);
}
public void generate(ServletWriter writer, Class phase) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
