You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/11/09 07:02:26 UTC
[iotdb] branch fix_java_version created (now 3e07be8d19)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch fix_java_version
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 3e07be8d19 [ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal
This branch includes the following new commits:
new 623bccd225 [ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal
new 3e07be8d19 [ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/02: [ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch fix_java_version
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 623bccd2259e163e466736b934e2fa9bbd1d2549
Author: HTHou <hh...@outlook.com>
AuthorDate: Wed Nov 9 15:01:44 2022 +0800
[ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal
---
.../src/main/java/org/apache/iotdb/commons/utils/JVMCommonUtils.java | 3 ++-
1 file changed, 2 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..1236878082 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,8 @@ 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("-internal")[0].split("\\.");
if (Integer.parseInt(javaVersionElements[0]) == 1) {
return Integer.parseInt(javaVersionElements[1]);
} else {
[iotdb] 02/02: [ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch fix_java_version
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3e07be8d19d7308f69f59703c93ca9ba3eda1e6b
Author: HTHou <hh...@outlook.com>
AuthorDate: Wed Nov 9 15:01:53 2022 +0800
[ISSUE-7941] Fix NumberFormatException when JDK version is 17-internal
---
.../iotdb/commons/utils/JVMCommonUtilsTest.java | 42 ++++++++++++++++++++++
1 file changed, 42 insertions(+)
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();
+ }
+ }
+}