Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory
james.mmbase.org:/tmp/cvs-serv27929/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
Modified Files:
CompareTag.java
Log Message:
jira: bugfix 1615 : compare tag fails to compare 'true' with 'true'
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
Index: CompareTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/CompareTag.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- CompareTag.java 27 Feb 2008 10:49:01 -0000 1.47
+++ CompareTag.java 3 Mar 2008 12:02:39 -0000 1.48
@@ -29,7 +29,7 @@
* variable equals a certain String value.
*
* @author Michiel Meeuwissen
- * @version $Id: CompareTag.java,v 1.47 2008/02/27 10:49:01 michiel Exp $
+ * @version $Id: CompareTag.java,v 1.48 2008/03/03 12:02:39 ernst Exp $
*/
public class CompareTag extends PresentTag implements Condition,
WriterReferrer {
@@ -89,7 +89,9 @@
// find compare1
if (getReferid() == null) {
compare1 = findWriter().getWriterValue();
- if (compare1 == null) compare1 = "";
+ if (compare1 == null){
+ compare1 = "";
+ }
} else {
compare1 = getObject(getReferid());
}
@@ -186,9 +188,9 @@
compare1n = new BigDecimal("0");
} else {
if ("true".equals(compare1)) {
- compare1n = 1;
+ compare1n = new BigDecimal(1);
} else if ("false".equals(compare1)) {
- compare1n = 0;
+ compare1n = new BigDecimal(0);
} else {
compare1n = new BigDecimal((String)compare1);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
