cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r406518 - /cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
Date Mon, 15 May 2006 03:41:08 GMT
Author: antonio
Date: Sun May 14 20:41:08 2006
New Revision: 406518

URL: http://svn.apache.org/viewcvs?rev=406518&view=rev
Log:
Make sure label can be ommitted.

Modified:
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java?rev=406518&r1=406517&r2=406518&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
(original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
Sun May 14 20:41:08 2006
@@ -171,10 +171,9 @@
                 }
 
                 // Get the label (can be ommitted)
-                itemCtx.setLenient(true);
-                label = itemCtx.getValue(this.labelPath);
-                if (label == null) {
-                    label = stringValue;
+                if (this.labelPath != null) {
+                    itemCtx.setLenient(true);
+                    label = itemCtx.getValue(this.labelPath);
                 }
             }
 



Mime
View raw message