LANG-1252: replacing system call for java 1.6 to SystemUtils.IS_JAVA_1_6
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/b3c31a37 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/b3c31a37 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/b3c31a37 Branch: refs/heads/master Commit: b3c31a379e9ad7cd22cb7f0669b82361ced84992 Parents: a266068 Author: Rob Tompkins <[email protected]> Authored: Sun Sep 11 10:54:59 2016 -0400 Committer: Rob Tompkins <[email protected]> Committed: Sun Sep 11 10:54:59 2016 -0400 ---------------------------------------------------------------------- src/main/java/org/apache/commons/lang3/math/NumberUtils.java | 5 ++--- .../java/org/apache/commons/lang3/math/NumberUtilsTest.java | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b3c31a37/src/main/java/org/apache/commons/lang3/math/NumberUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java index 995ae59..205baf4 100644 --- a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java +++ b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java @@ -21,6 +21,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.Validate; /** @@ -1407,8 +1408,6 @@ public class NumberUtils { boolean hasDecPoint = false; boolean allowSigns = false; boolean foundDigit = false; - boolean isJava6 = StringUtils.startsWith( - System.getProperty("java.version"), "1.6"); // deal with any possible sign up front final int start = (chars[0] == '-' || chars[0] == '+') ? 1 : 0; final boolean hasLeadingPlusSign = (start == 1 && chars[0] == '+'); @@ -1481,7 +1480,7 @@ public class NumberUtils { } if (i < chars.length) { if (chars[i] >= '0' && chars[i] <= '9') { - if (isJava6 && hasLeadingPlusSign && !hasDecPoint) { + if (SystemUtils.IS_JAVA_1_6 && hasLeadingPlusSign && !hasDecPoint) { return false; } // no type qualifier, OK http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b3c31a37/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java index ab8b11d..d9eee43 100644 --- a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java @@ -28,6 +28,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.junit.Test; /** @@ -1298,7 +1299,7 @@ public class NumberUtilsTest { @Test public void testLANG1252() { //Check idiosyncries between java 1.6 and 1.7,1.8 redarding leading + signs - if (StringUtils.startsWith(System.getProperty("java.version"), "1.6")) { + if (SystemUtils.IS_JAVA_1_6) { compareIsCreatableWithCreateNumber("+2", false); } else { compareIsCreatableWithCreateNumber("+2", true);
