kinman 02/04/10 14:14:20
Modified: jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
jasper/src/share/org/apache/jasper/servlet JspServlet.java
Removed: jasper/src/share/org/apache/jasper JasperError.java
Log:
- Fixed 7880. Spec requires that tag validation messages be returned with
a status of 500. Removed JasperError, and throw JasperException instead.
Thanks Ryan Lubke for the patch.
Revision Changes Path
1.37 +9 -9
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- JspParseEventListener.java 4 Dec 2001 02:49:05 -0000 1.36
+++ JspParseEventListener.java 10 Apr 2002 21:14:20 -0000 1.37
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.36 2001/12/04 02:49:05 larryi Exp $
- * $Revision: 1.36 $
- * $Date: 2001/12/04 02:49:05 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.37 2002/04/10 21:14:20 kinman Exp $
+ * $Revision: 1.37 $
+ * $Date: 2002/04/10 21:14:20 $
*
* ====================================================================
*
@@ -78,7 +78,6 @@
import javax.servlet.jsp.tagext.TagLibraryInfo;
import javax.servlet.jsp.tagext.ValidationMessage;
-import org.apache.jasper.JasperError;
import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
@@ -1134,16 +1133,17 @@
new Object[]{tli.getShortName()}));
errMessage.append("</h3>");
for (int i = 0; i < errors.length; i++) {
- errMessage.append("<p>");
- errMessage.append(errors[i].getId());
- errMessage.append(": ");
+ String id = errors[i].getId();
+ if (id != null) {
+ errMessage.append(errors[i].getId());
+ errMessage.append(": ");
+ }
errMessage.append(errors[i].getMessage());
- errMessage.append("</p>");
}
}
}
if (hasErrors)
- throw new JasperError(errMessage.toString());
+ throw new JasperException(errMessage.toString());
}
/**
1.28 +0 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JspServlet.java 2 Apr 2002 16:10:40 -0000 1.27
+++ JspServlet.java 10 Apr 2002 21:14:20 -0000 1.28
@@ -83,7 +83,6 @@
import java.security.Policy;
import java.security.PrivilegedAction;
-import org.apache.jasper.JasperError;
import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.Options;
@@ -474,9 +473,6 @@
serviceJspFile(request, response, jspUri, null, precompile);
} catch (RuntimeException e) {
throw e;
- } catch (JasperError ex) {
- response.setContentType("text/html");
- response.getWriter().print(ex.getMessage());
} catch (ServletException e) {
throw e;
} catch (IOException e) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
