cmlenz 02/01/27 13:16:52
Modified: src/taglib/jstl/org/apache/slide/taglib/tag/jstl Tag:
SLIDE_1_0 JstlTagUtils.java
Log:
Port bugfix (check for null expressions)
Revision Changes Path
No revision
No revision
1.1.2.2 +10 -4
jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java
Index: JstlTagUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JstlTagUtils.java 27 Jan 2002 16:06:55 -0000 1.1.2.1
+++ JstlTagUtils.java 27 Jan 2002 21:16:52 -0000 1.1.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v
1.1.2.1 2002/01/27 16:06:55 cmlenz Exp $
- * $Revision: 1.1.2.1 $
- * $Date: 2002/01/27 16:06:55 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v
1.1.2.2 2002/01/27 21:16:52 cmlenz Exp $
+ * $Revision: 1.1.2.2 $
+ * $Date: 2002/01/27 21:16:52 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* tag.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
*/
public class JstlTagUtils {
@@ -110,6 +110,9 @@
PageContext pageContext)
throws JspException {
+ if (expression == null) {
+ return null;
+ }
Object result = null;
try {
result =
@@ -136,6 +139,9 @@
PageContext pageContext)
throws JspException {
+ if (expression == null) {
+ throw new NullAttributeException(tagName, attributeName);
+ }
Object result =
ExpressionEvaluatorManager.evaluate(attributeName, expression,
expectedType, tag,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
