svn commit: r190804 - /struts/taglib/trunk/src/java/org/apache/struts/taglib/html/OptionsTag.java

[jholmes]

Author: jholmes
Date: Wed Jun 15 13:57:16 2005
New Revision: 190804

URL: http://svn.apache.org/viewcvs?rev=190804&view=rev
Log:
Updated OptionsTag logic to be more efficient with use of iterators.

PR:  Bugzilla #3202

Modified:
    struts/taglib/trunk/src/java/org/apache/struts/taglib/html/OptionsTag.java

Modified: 
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/OptionsTag.java
URL: 
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/html/OptionsTag.java?rev=190804&r1=190803&r2=190804&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/html/OptionsTag.java 
(original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/html/OptionsTag.java 
Wed Jun 15 13:57:16 2005
@@ -242,9 +242,9 @@
             // 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(name, property); // Same coll.
+//            } else {
                 labelsIterator = getIterator(labelName, labelProperty);
             }
 
@@ -256,7 +256,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]