craigmcc 02/03/11 21:46:52
Modified: src/share/org/apache/struts/taglib/html Tag:
STRUTS_1_0_BRANCH OptionsTag.java
Log:
Port the fix for handling null values in the labels and values collections.
PR: Bugzilla #6439
Submitted by: Wilhelm Fitzpatrick <rafial at well.com>
Revision Changes Path
No revision
No revision
1.7.2.7 +12 -3
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java
Index: OptionsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -r1.7.2.6 -r1.7.2.7
--- OptionsTag.java 5 Oct 2001 05:05:48 -0000 1.7.2.6
+++ OptionsTag.java 12 Mar 2002 05:46:51 -0000 1.7.2.7
@@ -290,10 +290,19 @@
// Render the options tags for each element of the values coll.
while (valuesIterator.hasNext()) {
- String value = valuesIterator.next().toString();
+ Object valueObject = valuesIterator.next();
+ if (valueObject == null) {
+ valueObject = "";
+ }
+ String value = valueObject.toString();
String label = value;
- if (labelsIterator.hasNext())
- label = labelsIterator.next().toString();
+ if (labelsIterator.hasNext()) {
+ Object labelObject = labelsIterator.next();
+ if (labelObject == null) {
+ labelObject = "";
+ }
+ label = labelObject.toString();
+ }
addOption(sb, value, label,
selectTag.isMatched(value));
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
