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 995ae597e..205baf4ed 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.BigInteger; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.Validate; /** @@ -1407,8 +1408,6 @@ public static boolean isCreatable(final String str) { 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 static boolean isCreatable(final String str) { } 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 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 ab8b11da1..d9eee43cd 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.BigInteger; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.junit.Test; /** @@ -1298,7 +1299,7 @@ public void testLANG972() { @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);