[iotdb] branch master updated: [ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal (#7947)

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 44c090592b [ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal (#7947)
44c090592b is described below

commit 44c090592b6eee7a3c49ebc9b19249c2e3dfaf68
Author: Haonan <hh...@outlook.com>
AuthorDate: Thu Nov 10 20:53:40 2022 +0800

    [ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal (#7947)
---
 .../apache/iotdb/commons/utils/JVMCommonUtils.java |  2 +-
 .../iotdb/commons/utils/JVMCommonUtilsTest.java    | 42 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/utils/JVMCommonUtils.java b/node-commons/src/main/java/org/apache/iotdb/commons/utils/JVMCommonUtils.java
index a0a80cf33e..f730eeb34a 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/utils/JVMCommonUtils.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/utils/JVMCommonUtils.java
@@ -40,7 +40,7 @@ public class JVMCommonUtils {
    * @return JDK version (int type)
    */
   public static int getJdkVersion() {
-    String[] javaVersionElements = System.getProperty("java.version").split("\\.");
+    String[] javaVersionElements = System.getProperty("java.version").split("-")[0].split("\\.");
     if (Integer.parseInt(javaVersionElements[0]) == 1) {
       return Integer.parseInt(javaVersionElements[1]);
     } else {
diff --git a/node-commons/src/test/java/org/apache/iotdb/commons/utils/JVMCommonUtilsTest.java b/node-commons/src/test/java/org/apache/iotdb/commons/utils/JVMCommonUtilsTest.java
new file mode 100644
index 0000000000..4a247cfb76
--- /dev/null
+++ b/node-commons/src/test/java/org/apache/iotdb/commons/utils/JVMCommonUtilsTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.commons.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class JVMCommonUtilsTest {
+
+  @Test
+  public void getJdkVersionTest() {
+    try {
+      System.setProperty("java.version", "1.8.0_233");
+      Assert.assertEquals(8, JVMCommonUtils.getJdkVersion());
+      System.setProperty("java.version", "11.0.16");
+      Assert.assertEquals(11, JVMCommonUtils.getJdkVersion());
+      System.setProperty("java.version", "11.0.8-internal");
+      Assert.assertEquals(11, JVMCommonUtils.getJdkVersion());
+      System.setProperty("java.version", "17-internal");
+      Assert.assertEquals(17, JVMCommonUtils.getJdkVersion());
+    } catch (Exception e) {
+      Assert.fail();
+    }
+  }
+}