Merge pull request #61 from remkop/master

Fix issue where bitModel could not be retrieved on GraalVM
fusesource · May 5, 2020 · 8678713 · 8678713
2 parents d145a1d + 2c64ed4
commit 8678713
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/hawtjni-runtime/src/main/java/org/fusesource/hawtjni/runtime/Library.java b/hawtjni-runtime/src/main/java/org/fusesource/hawtjni/runtime/Library.java
@@ -171,6 +171,11 @@ public static int getBitModel() {
         if( prop!=null ) {
             return Integer.parseInt(prop);
         }
+        // GraalVM support, see https://github.com/fusesource/jansi/issues/162
+        String arch = System.getProperty("os.arch");
+        if (arch.endsWith("64") && "Substrate VM".equals(System.getProperty("java.vm.name"))) {
+            return 64;
+        }
         return -1; // we don't know..
     }