kinman 2002/06/20 13:12:26
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Parser.java
Log:
- Fixed 10035: <jsp:params> in <jsp:plugin> rejected.
- Also fixed a potential problem in Generator for plugins.
Revision Changes Path
1.31 +9 -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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Generator.java 13 Jun 2002 22:56:11 -0000 1.30
+++ Generator.java 20 Jun 2002 20:12:26 -0000 1.31
@@ -944,7 +944,7 @@
// First compose the runtime output string
String s0 = "<OBJECT classid=\"" + ctxt.getOptions().getIeClassId()+
"\"" + makeAttr("name", name);
- String s1="", s2="";
+ String s1, s2;
if (width != null) {
if (width.isExpression()) {
s1 = quote(s0 + " width=\"") + " + " + width.getValue() +
@@ -952,6 +952,8 @@
} else {
s1 = quote(s0 + makeAttr("width", width.getValue()));
}
+ } else {
+ s1 = quote(s0);
}
if (height != null) {
if (height.isExpression()) {
@@ -960,6 +962,8 @@
} else {
s2 = quote(makeAttr("height", height.getValue()));
}
+ } else {
+ s2 = "\"\"";
}
String s3 = quote(makeAttr("hspace", hspace) +
makeAttr("vspace", vspace) +
@@ -1029,7 +1033,7 @@
s2 = quote(makeAttr("height", height.getValue()));
}
} else {
- s2 = "";
+ s2 = "\"\"";
}
s3 = quote(makeAttr("hspace", hspace) +
1.6 +5 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Parser.java 13 Jun 2002 18:56:18 -0000 1.5
+++ Parser.java 20 Jun 2002 20:12:26 -0000 1.6
@@ -586,7 +586,7 @@
}
/*
- * JspParams ::= S? '>' Params+ </jsp:params' S? '>'
+ * JspParams ::= S? '>' S? Params+ </jsp:params' S? '>'
*/
private void parseJspParams(Node parent) throws JasperException {
@@ -595,6 +595,7 @@
err.jspError(reader.mark(), "jsp.error.params.notclosed");
}
+ reader.skipSpaces();
Node jspParamsNode = new Node.ParamsAction(start, parent);
parseParams(jspParamsNode, "jsp:params");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>