Author: jholmes
Date: Wed Jun 15 14:01:56 2005
New Revision: 190807
URL: http://svn.apache.org/viewcvs?rev=190807&view=rev
Log:
Merge changes to 1.2 branch for PR: Bugzilla #3202
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/OptionsTag.java
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/OptionsTag.java
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/OptionsTag.java?rev=190807&r1=190806&r2=190807&view=diff
==============================================================================
---
struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/OptionsTag.java
(original)
+++
struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/OptionsTag.java
Wed Jun 15 14:01:56 2005
@@ -242,9 +242,7 @@
// Construct iterators for the values and labels collections
Iterator valuesIterator = getIterator(name, property);
Iterator labelsIterator = null;
- if ((labelName == null) && (labelProperty == null)) {
- labelsIterator = getIterator(name, property); // Same coll.
- } else {
+ if ((labelName != null) || (labelProperty != null)) {
labelsIterator = getIterator(labelName, labelProperty);
}
@@ -256,7 +254,7 @@
}
String value = valueObject.toString();
String label = value;
- if (labelsIterator.hasNext()) {
+ if ((labelsIterator != null) && labelsIterator.hasNext()) {
Object labelObject = labelsIterator.next();
if (labelObject == null) {
labelObject = "";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
