Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv30341
Modified Files:
NumberDataType.java
Log Message:
fixed failing test-cases
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
Index: NumberDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/NumberDataType.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- NumberDataType.java 12 Sep 2008 09:21:37 -0000 1.32
+++ NumberDataType.java 1 Dec 2008 23:28:56 -0000 1.33
@@ -22,7 +22,7 @@
* A DataType representing some kind of numeric value, like a floating point
number or an integer number.
*
* @author Pierre van Rooden
- * @version $Id: NumberDataType.java,v 1.32 2008/09/12 09:21:37 michiel Exp $
+ * @version $Id: NumberDataType.java,v 1.33 2008/12/01 23:28:56 michiel Exp $
* @since MMBase-1.8
*/
abstract public class NumberDataType<E extends Number & Comparable<E>> extends
ComparableDataType<E> {
@@ -61,9 +61,18 @@
}
}
return number;
+ } else if (preCast instanceof Float) {
+ if (((Float) preCast).isInfinite()) {
+ return (Float) preCast;
}
+ } else if (preCast instanceof Double) {
+ if (((Double) preCast).isInfinite()) {
+ return (Double) preCast;
+ }
+ }
+
- return Casting.toDouble(preCast); // this makes it e.g. possible to
report that 1e20 is too big for an integer.
+ return Casting.toDecimal(preCast); // this makes it e.g. possible to
report that 1e20 is too big for an integer.
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
