arron 02/05/12 19:36:39
Modified: src/share/org/apache/struts/taglib/html BaseHandlerTag.java
Log:
Fixed the checking of a null key value before the fetching of messages.
Bug 7411, reported by Cuck Cavaness.
Revision Changes Path
1.14 +8 -6
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
Index: BaseHandlerTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BaseHandlerTag.java 13 Jan 2002 03:38:38 -0000 1.13
+++ BaseHandlerTag.java 13 May 2002 02:36:39 -0000 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
1.13 2002/01/13 03:38:38 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2002/01/13 03:38:38 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
1.14 2002/05/13 02:36:39 arron Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/05/13 02:36:39 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* appropriate implementations of these.
*
* @author Don Clasen
- * @version $Revision: 1.13 $ $Date: 2002/01/13 03:38:38 $
+ * @version $Revision: 1.14 $ $Date: 2002/05/13 02:36:39 $
*/
public abstract class BaseHandlerTag extends BodyTagSupport {
@@ -565,8 +565,10 @@
return (literal);
}
} else {
- return (RequestUtils.message(pageContext, getBundle(),
- getLocale(), key));
+ if (key != null) {
+ return (RequestUtils.message(pageContext, getBundle(),
+ getLocale(), key));
+ }
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
