Skip to content

Commit 4141a35

Browse files
committed
GH-218, use system property 'java.vendor.version' to detect GraalVM running on JDK 11
1 parent f0820c6 commit 4141a35

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/SamplerSupport.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
package org.graalvm.visualvm.sampler.truffle;
2727

28+
import java.util.Properties;
2829
import org.graalvm.visualvm.application.Application;
2930
import org.graalvm.visualvm.application.jvm.Jvm;
3031
import org.graalvm.visualvm.application.jvm.JvmFactory;
@@ -39,7 +40,9 @@
3940
* @author Jiri Sedlacek
4041
* @author Tomas Hurka
4142
*/
42-
public final class SamplerSupport {
43+
public final class SamplerSupport {
44+
45+
private static final String GRAALVM_ID = "GraalVM"; // NOI18N
4346
private static SamplerSupport instance;
4447

4548
private ApplicationSamplerViewProvider samplerViewProvider;
@@ -75,6 +78,15 @@ private SamplerSupport() {
7578
}
7679

7780
private boolean isRunningOnGraalVM(Jvm jvm) {
78-
return (jvm.getVmName().contains("GraalVM")); // NOI18N
81+
if (jvm.getVmName().contains(GRAALVM_ID)) {
82+
return true;
83+
}
84+
if (jvm.isGetSystemPropertiesSupported()) {
85+
Properties props = jvm.getSystemProperties();
86+
String vendorVersion = props.getProperty("java.vendor.version", ""); // NOI18N
87+
88+
return vendorVersion.contains(GRAALVM_ID);
89+
}
90+
return false;
7991
}
8092
}

0 commit comments

Comments
 (0)