kinman 02/04/11 11:14:03
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
JspReader.java Validator.java
Log:
- Fixed some tag related problems.
Revision Changes Path
1.4 +5 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Generator.java 5 Apr 2002 18:40:50 -0000 1.3
+++ Generator.java 11 Apr 2002 18:14:03 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.3 2002/04/05 18:40:50 kinman Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/05 18:40:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.4 2002/04/11 18:14:03 kinman Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/11 18:14:03 $
*
* ====================================================================
*
@@ -317,9 +317,10 @@
public void visit(Node.ParamAction n) throws JasperException {
+ out.print(" + \"");
out.print(separator);
out.print(n.getAttributeValue("name"));
- out.print('=');
+ out.print("=\" + ");
out.print(attributeValue(n.getValue(), true));
// The separator is '&' after the second use
1.3 +3 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java
Index: JspReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspReader.java 4 Apr 2002 02:34:01 -0000 1.2
+++ JspReader.java 11 Apr 2002 18:14:03 -0000 1.3
@@ -410,7 +410,9 @@
ret = mark(), ch = nextChar()) {
if (ch == limit.charAt(0)) {
for (int i = 1 ; i < limlen ; i++) {
- if (Character.toLowerCase((char) nextChar()) != limit.charAt(i))
+ if (peekChar() == limit.charAt(i))
+ nextChar();
+ else
continue skip;
}
return ret;
1.3 +5 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Validator.java 8 Apr 2002 21:47:30 -0000 1.2
+++ Validator.java 11 Apr 2002 18:14:03 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
1.2 2002/04/08 21:47:30 kinman Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/08 21:47:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
1.3 2002/04/11 18:14:03 kinman Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/11 18:14:03 $
*
* ====================================================================
*
@@ -175,7 +175,7 @@
err.jspError(n, "jsp.error.buffer.multiple");
bufferSeen = true;
- if ("none".equalsIgnoreCase(attr))
+ if ("none".equalsIgnoreCase(value))
pageInfo.setBuffer(0);
else {
if (value == null || !value.endsWith("kb"))
@@ -232,7 +232,7 @@
}
// Check for bad combinations
- if (pageInfo.getBuffer() == 0 && pageInfo.isAutoFlush())
+ if (pageInfo.getBuffer() == 0 && !pageInfo.isAutoFlush())
err.jspError(n, "jsp.error.page.badCombo");
// Attributes for imports for this node have been processed by
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
