Split java.version on non-digit char

Author: srowen

common/unsafe/src/main/java/org/apache/spark/unsafe/Platform.java

@@ -88,7 +88,8 @@ public final class Platform {
   private static final Method CLEANER_CREATE_METHOD;
   static {
     // The implementation of Cleaner changed from JDK 8 to 9
-    int majorVersion = Integer.parseInt(System.getProperty("java.version").split("\\.")[0]);
+    // Split java.version on non-digit chars:
+    int majorVersion = Integer.parseInt(System.getProperty("java.version").split("\\D+")[0]);
     String cleanerClassName;
     if (majorVersion < 9) {
       cleanerClassName = "sun.misc.Cleaner";

core/src/main/scala/org/apache/spark/storage/StorageUtils.scala

@@ -201,7 +201,8 @@ private[spark] object StorageUtils extends Logging {
   // reflection. However sun.misc.Unsafe added a invokeCleaner() method in JDK 9+ and this is
   // still accessible with reflection.
   private val bufferCleaner: DirectBuffer => Unit =
-    if (System.getProperty("java.version").split("\\.").head.toInt < 9) {
+    // Split java.version on non-digit chars:
+    if (System.getProperty("java.version").split("\\D+").head.toInt < 9) {
       // scalastyle:off classforname
       val cleanerMethod = Class.forName("sun.misc.Cleaner").getMethod("clean")
       // scalastyle:on classforname