Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory 
james.mmbase.org:/tmp/cvs-serv3179/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow

Modified Files:
        CompareTag.java 
Log Message:
         MMB-1617


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
See also: http://www.mmbase.org/jira/browse/MMB-1617


Index: CompareTag.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/CompareTag.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- CompareTag.java     3 Mar 2008 12:02:39 -0000       1.48
+++ CompareTag.java     3 Mar 2008 16:08:24 -0000       1.49
@@ -29,7 +29,7 @@
  * variable equals a certain String value.
  *
  * @author Michiel Meeuwissen
- * @version $Id: CompareTag.java,v 1.48 2008/03/03 12:02:39 ernst Exp $
+ * @version $Id: CompareTag.java,v 1.49 2008/03/03 16:08:24 ernst Exp $
  */
 
 public class CompareTag extends PresentTag implements Condition, 
WriterReferrer {
@@ -154,7 +154,11 @@
                     if (compare2 instanceof String) {
                         if ("".equals(compare2)) { // do something reasonable 
in IsEmpty
                             compare2 = new BigDecimal("0");
+                        }else 
if("true".equals(((String)compare2).toLowerCase()) || 
"false".equals((((String)compare2).toLowerCase()))) {
+                            //if compare1 was a boolean it will be a number by 
now, and we will have to change compare2 to a number too.
+                            compare2 = new BigDecimal(Casting.toInteger(new 
Boolean((String)compare2)));
                         } else {
+                            log.info("** compare2="+compare2+", 
compare1="+compare1);
                             compare2 = new BigDecimal((String)compare2);
                         }
                     } else if (compare2 instanceof Number) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to