Author: henrib Date: Fri Jul 24 06:16:45 2015 New Revision: 1692459 URL: http://svn.apache.org/r1692459 Log: JEXL: Fix JEXL-167: use BigDecimal.toBigInteger(...) to coerce big decimal to big integer
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java commons/proper/jexl/trunk/src/site/xdoc/changes.xml commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JexlTest.java Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java?rev=1692459&r1=1692458&r2=1692459&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java (original) +++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java Fri Jul 24 06:16:45 2015 @@ -1251,6 +1251,8 @@ public class JexlArithmetic { } else { return BigInteger.valueOf(dval.longValue()); } + } else if (val instanceof BigDecimal) { + return ((BigDecimal) val).toBigInteger(); } else if (val instanceof Number) { return BigInteger.valueOf(((Number) val).longValue()); } else if (val instanceof Boolean) { Modified: commons/proper/jexl/trunk/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/site/xdoc/changes.xml?rev=1692459&r1=1692458&r2=1692459&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/site/xdoc/changes.xml (original) +++ commons/proper/jexl/trunk/src/site/xdoc/changes.xml Fri Jul 24 06:16:45 2015 @@ -26,6 +26,15 @@ </properties> <body> <release version="3.0" date="unreleased"> + <action dev="henrib" type="fix" issue="JEXL-79" due-to="sebb"> + Add support for growable arrays (ArrayLists) + </action> + <action dev="henrib" type="fix" issue="JEXL-167" due-to="Dmitri Blinov"> + Possible loss of value when converting BigDecimal to BigInteger + </action> + <action dev="henrib" type="fix" issue="JEXL-166" due-to="Dmitri Blinov"> + Incorrect operator symbol for bitwise complement in jexlArithmetic + </action> <action dev="henrib" type="add" issue="JEXL-164" due-to="Dmitri Blinov"> public getters for high/low properties for IntegerRange and LongRange </action> @@ -38,6 +47,12 @@ <action dev="henrib" type="fix" issue="JEXL-160" due-to="Dmitri Blinov"> typo in package.html </action> + <action dev="henrib" type="fix" issue="JEXL-158" due-to="Lars Cebulla"> + Handle locale decimal separators correctly + </action> + <action dev="henrib" type="fix" issue="JEXL-157" due-to="Lars Cebulla"> + Replace File.pathSeparator with File.separator + </action> <action dev="henrib" type="add" > Added a method to get parameters from a template </action> Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JexlTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JexlTest.java?rev=1692459&r1=1692458&r2=1692459&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JexlTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JexlTest.java Fri Jul 24 06:16:45 2015 @@ -35,7 +35,7 @@ import org.junit.Assert; import org.junit.Test; /** - * Simple testcases + * Simple test cases. * * @since 1.0 */