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

(LANG-624) SystemUtils.getJavaVersionAsFloat throws StringIndexOutOfBoundsException on Android runtime/Dalvik VM. Oops, fix return type. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@949223 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2010-05-28 16:33:23 +00:00
parent 2d9a9ae59f
commit eb79f7c6f3
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/lang3/SystemUtils.java
View File

@ -1669,7 +1669,7 @@ static float toJavaVersionFloat(String version) {
*
* @return the version, for example 131 for Java 1.3.1
*/
static float toJavaVersionInt(String version) {
static int toJavaVersionInt(String version) {
return toVersionInt(toJavaVersionIntArray(version, JAVA_VERSION_TRIM_SIZE));
}

30
src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
View File

@ -207,22 +207,22 @@ public void testJavaVersionAsFloat() {
}
public void testJavaVersionAsInt() {
assertEquals(0, SystemUtils.toJavaVersionInt(null), 0.000001f);
assertEquals(0, SystemUtils.toJavaVersionInt(""), 0.000001f);
assertEquals(0, SystemUtils.toJavaVersionInt("0"), 0.000001f);
assertEquals(110, SystemUtils.toJavaVersionInt("1.1"), 0.000001f);
assertEquals(120, SystemUtils.toJavaVersionInt("1.2"), 0.000001f);
assertEquals(130, SystemUtils.toJavaVersionInt("1.3.0"), 0.000001f);
assertEquals(131, SystemUtils.toJavaVersionInt("1.3.1"), 0.000001f);
assertEquals(140, SystemUtils.toJavaVersionInt("1.4.0"), 0.000001f);
assertEquals(141, SystemUtils.toJavaVersionInt("1.4.1"), 0.000001f);
assertEquals(142, SystemUtils.toJavaVersionInt("1.4.2"), 0.000001f);
assertEquals(150, SystemUtils.toJavaVersionInt("1.5.0"), 0.000001f);
assertEquals(160, SystemUtils.toJavaVersionInt("1.6.0"), 0.000001f);
assertEquals(131, SystemUtils.toJavaVersionInt("JavaVM-1.3.1"), 0.000001f);
assertEquals(131, SystemUtils.toJavaVersionInt("1.3.1 subset"), 0.000001f);
assertEquals(0, SystemUtils.toJavaVersionInt(null));
assertEquals(0, SystemUtils.toJavaVersionInt(""));
assertEquals(0, SystemUtils.toJavaVersionInt("0"));
assertEquals(110, SystemUtils.toJavaVersionInt("1.1"));
assertEquals(120, SystemUtils.toJavaVersionInt("1.2"));
assertEquals(130, SystemUtils.toJavaVersionInt("1.3.0"));
assertEquals(131, SystemUtils.toJavaVersionInt("1.3.1"));
assertEquals(140, SystemUtils.toJavaVersionInt("1.4.0"));
assertEquals(141, SystemUtils.toJavaVersionInt("1.4.1"));
assertEquals(142, SystemUtils.toJavaVersionInt("1.4.2"));
assertEquals(150, SystemUtils.toJavaVersionInt("1.5.0"));
assertEquals(160, SystemUtils.toJavaVersionInt("1.6.0"));
assertEquals(131, SystemUtils.toJavaVersionInt("JavaVM-1.3.1"));
assertEquals(131, SystemUtils.toJavaVersionInt("1.3.1 subset"));
// This used to return 0f in [lang] version 2.5:
assertEquals(130, SystemUtils.toJavaVersionInt("XXX-1.3.x"), 0.000001f);
assertEquals(130, SystemUtils.toJavaVersionInt("XXX-1.3.x"));
}
public void testJavaVersionAtLeastFloat() {