forked from hazelcast/hazelcast
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request hazelcast#14835 from mmedenjak/openj9-module-log-m…
…aintenance Log a warning for illegal reflective access operation in Java9+ OpenJ9
- Loading branch information
Showing
3 changed files
with
155 additions
and
13 deletions.
There are no files selected for viewing
62 changes: 62 additions & 0 deletions
62
hazelcast/src/main/java/com/hazelcast/internal/util/JavaVm.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed 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 com.hazelcast.internal.util; | ||
|
|
||
| import java.util.Properties; | ||
|
|
||
| /** | ||
| * Utility for checking runtime Java VM. | ||
| * | ||
| */ | ||
| public enum JavaVm { | ||
| UNKNOWN, | ||
| HOTSPOT, | ||
| OPENJ9; | ||
|
|
||
| public static final JavaVm CURRENT_VM = detectCurrentVM(); | ||
|
|
||
| private static JavaVm detectCurrentVM() { | ||
| Properties properties = System.getProperties(); | ||
| return parse(properties); | ||
| } | ||
|
|
||
| static JavaVm parse(Properties properties) { | ||
| String vmName = properties.getProperty("java.vm.name"); | ||
| if (vmName == null) { | ||
| return UNKNOWN; | ||
| } | ||
| // Oracle JDK 'java.vm.name': Java HotSpot(TM) 64-Bit Server VM | ||
| // Oracle JDK 'sun.management.compiler': HotSpot 64-Bit Tiered Compilers | ||
| if (vmName.contains("HotSpot")) { | ||
| return HOTSPOT; | ||
| } | ||
| // Eclipse OpenJ9 'java.vm.name': Eclipse OpenJ9 VM | ||
| if (vmName.contains("OpenJ9")) { | ||
| return OPENJ9; | ||
| } | ||
| String prop = properties.getProperty("sun.management.compiler"); | ||
| if (prop == null) { | ||
| return UNKNOWN; | ||
| } | ||
| // HotSpot based OpenJDK builds 'java.vm.name': OpenJDK 64-Bit Server VM. | ||
| // HotSpot based OpenJDK builds 'sun.management.compiler': HotSpot 64-Bit Tiered Compilers | ||
| if (prop.contains("HotSpot")) { | ||
| return HOTSPOT; | ||
| } | ||
| return UNKNOWN; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
hazelcast/src/test/java/com/hazelcast/internal/util/JavaVmTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed 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 com.hazelcast.internal.util; | ||
|
|
||
| import com.hazelcast.test.HazelcastSerialClassRunner; | ||
| import com.hazelcast.test.annotation.ParallelTest; | ||
| import com.hazelcast.test.annotation.QuickTest; | ||
| import org.junit.Test; | ||
| import org.junit.experimental.categories.Category; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import java.util.Properties; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
|
|
||
| @RunWith(HazelcastSerialClassRunner.class) | ||
| @Category({QuickTest.class, ParallelTest.class}) | ||
| public class JavaVmTest { | ||
|
|
||
| @Test | ||
| public void parseOracleJdkProps() { | ||
| Properties props = new Properties(); | ||
| props.put("java.vm.name", "Java HotSpot(TM) 64-Bit Server VM"); | ||
| props.put("sun.management.compiler", "HotSpot 64-Bit Tiered Compilers"); | ||
|
|
||
| JavaVm javaVm = JavaVm.parse(props); | ||
| assertEquals(JavaVm.HOTSPOT, javaVm); | ||
| } | ||
|
|
||
| @Test | ||
| public void parseZuluOpenJdkProps() { | ||
| Properties props = new Properties(); | ||
| props.put("java.vm.name", "OpenJDK 64-Bit Server VM"); | ||
| props.put("sun.management.compiler", "HotSpot 64-Bit Tiered Compilers"); | ||
|
|
||
| JavaVm javaVm = JavaVm.parse(props); | ||
| assertEquals(JavaVm.HOTSPOT, javaVm); | ||
| } | ||
|
|
||
| @Test | ||
| public void parseEclipseOpenJdkProps() { | ||
| Properties props = new Properties(); | ||
| props.put("java.vm.name", "OpenJDK 64-Bit Server VM"); | ||
| props.put("sun.management.compiler", "HotSpot 64-Bit Tiered Compilers"); | ||
|
|
||
| JavaVm javaVm = JavaVm.parse(props); | ||
| assertEquals(JavaVm.HOTSPOT, javaVm); | ||
| } | ||
|
|
||
| @Test | ||
| public void parseEclipseOpenJ9OpenJdkProps() { | ||
| Properties props = new Properties(); | ||
| props.put("java.vm.name", "Eclipse OpenJ9 VM"); | ||
|
|
||
| JavaVm javaVm = JavaVm.parse(props); | ||
| assertEquals(JavaVm.OPENJ9, javaVm); | ||
| } | ||
| } |