[FIXED JENKINS-10752] added support for OpenJDK+JamVM on ARM

jenkinsci · Aug 18, 2011 · d37e1ac · d37e1ac
1 parent 3bc74ba
commit d37e1ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/xstream-benchmark/.svn/entries b/xstream-benchmark/.svn/entries
@@ -26,9 +26,6 @@ svn:special svn:externals svn:needs-lock
 
 9830eeb5-ddf4-0310-9ef7-f4b9a3e3227e
 
-src
-dir
-
 pom.xml
 file
 
@@ -63,3 +60,13 @@ has-props
 
 2705
 
+src
+dir
+
+xstream-benchmark.iml
+file
+0
+
+
+add
+
diff --git a/xstream/src/java/com/thoughtworks/xstream/core/JVM.java b/xstream/src/java/com/thoughtworks/xstream/core/JVM.java
@@ -31,6 +31,7 @@ public class JVM {
     private final boolean supportsSQL = loadClass("java.sql.Date") != null; 
 
     private static final String vendor = System.getProperty("java.vm.vendor");
+    private static final String runtime = System.getProperty("java.runtime.name");
     private static final float majorJavaVersion = getMajorJavaVersion();
     private static final boolean reverseFieldOrder = isHarmony() || (isIBM() && !is15());
 
@@ -63,6 +64,14 @@ public static boolean is16() {
         return majorJavaVersion >= 1.6f;
     }
 
+    private static boolean isIcedTea() {
+        return runtime.indexOf("IcedTea") != -1;
+    }
+
+    private static boolean isOpenJDK() {
+        return runtime.indexOf("OpenJDK") != -1;
+    }
+
     private static boolean isSun() {
         return vendor.indexOf("Sun") != -1;
     }
@@ -187,6 +196,8 @@ public synchronized ReflectionProvider bestReflectionProvider() {
 
     private boolean canUseSun14ReflectionProvider() {
         return (isSun()
+            || isOpenJDK()
+            || isIcedTea()
             || isApple()
             || isHPUX()
             || isIBM()