Skip to content

Commit 3bea3b8

Browse files
committed
Merge branch 'master' into graal
2 parents 5c51e49 + ad76e9d commit 3bea3b8

File tree

6 files changed

+6
-0
lines changed

6 files changed

+6
-0
lines changed

visualvm/launcher/visualvm.exe

6.85 KB
Binary file not shown.
6.87 KB
Binary file not shown.
6.87 KB
Binary file not shown.
6.87 KB
Binary file not shown.
6.87 KB
Binary file not shown.

visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ public boolean hasSupportedJavaPlatforms() {
116116
String code = "jdk1" + (5 + i); // NOI18N
117117
if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) return true;
118118
}
119+
String code = "jdk100"; // NOI18N
120+
if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) return true;
121+
code = "jdk110"; // NOI18N
122+
if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) return true;
123+
code = "jdk120"; // NOI18N
124+
if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) return true;
119125
return false;
120126
}
121127

0 commit comments

Comments
 (0)