Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-1252: replacing system call for java 1.6 to SystemUtils.IS_JAVA_1_6

This commit is contained in:
Rob Tompkins 2016-09-11 10:54:59 -04:00
parent a266068798
commit b3c31a379e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/apache/commons/lang3/math/NumberUtils.java
View File

@ -21,6 +21,7 @@ import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
/** /**
@ -1407,8 +1408,6 @@ public class NumberUtils {
boolean hasDecPoint = false; boolean hasDecPoint = false;
boolean allowSigns = false; boolean allowSigns = false;
boolean foundDigit = false; boolean foundDigit = false;
boolean isJava6 = StringUtils.startsWith(
System.getProperty("java.version"), "1.6");
// deal with any possible sign up front // deal with any possible sign up front
final int start = (chars[0] == '-' || chars[0] == '+') ? 1 : 0; final int start = (chars[0] == '-' || chars[0] == '+') ? 1 : 0;
final boolean hasLeadingPlusSign = (start == 1 && chars[0] == '+'); final boolean hasLeadingPlusSign = (start == 1 && chars[0] == '+');
@ -1481,7 +1480,7 @@ public class NumberUtils {
} }
if (i < chars.length) { if (i < chars.length) {
if (chars[i] >= '0' && chars[i] <= '9') { if (chars[i] >= '0' && chars[i] <= '9') {
if (isJava6 && hasLeadingPlusSign && !hasDecPoint) { if (SystemUtils.IS_JAVA_1_6 && hasLeadingPlusSign && !hasDecPoint) {
return false; return false;
} }
// no type qualifier, OK // no type qualifier, OK

3
src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
View File

@ -28,6 +28,7 @@ import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.junit.Test; import org.junit.Test;
/** /**
@ -1298,7 +1299,7 @@ public class NumberUtilsTest {
@Test @Test
public void testLANG1252() { public void testLANG1252() {
//Check idiosyncries between java 1.6 and 1.7,1.8 redarding leading + signs //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); compareIsCreatableWithCreateNumber("+2", false);
} else { } else {
compareIsCreatableWithCreateNumber("+2", true); compareIsCreatableWithCreateNumber("+2", true);