craigmcc 02/03/11 21:46:08
Modified: src/share/org/apache/struts/taglib/html OptionsTag.java
Log:
Properly deal with null values in either the labels or values array, by
converting them to zero-length strings instead of throwing NPEs.
PR: Bugzilla #6439
Submitted by: Wilhelm Fitzpatrick <rafial at well.com>
Revision Changes Path
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- OptionsTag.java 5 Oct 2001 05:07:47 -0000 1.14
+++ OptionsTag.java 12 Mar 2002 05:46:08 -0000 1.15
@@ -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]>
