Skip to content

Commit 77e36f9

Browse files
authored
Merge pull request #181 from pshipton/noperf
OpenJ9 doesn't support Perf, don't try to use it
2 parents f8fef7d + 3f5e4a8 commit 77e36f9

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

src/jdk.internal.jvmstat/share/classes/sun/jvmstat/PlatformSupport.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,7 @@ public class PlatformSupport {
5656
}
5757

5858
public static PlatformSupport getInstance() {
59-
try {
60-
Class<?> c = Class.forName("sun.jvmstat.PlatformSupportImpl");
61-
@SuppressWarnings("unchecked")
62-
Constructor<PlatformSupport> cntr = (Constructor<PlatformSupport>) c.getConstructor();
63-
return cntr.newInstance();
64-
} catch (ClassNotFoundException e) {
65-
return new PlatformSupport();
66-
} catch (ReflectiveOperationException e) {
67-
throw new InternalError(e);
68-
}
59+
return new PlatformSupport();
6960
}
7061

7162
// package-private

src/jdk.jconsole/share/classes/sun/tools/jconsole/LocalVirtualMachine.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,6 @@ private static void getMonitoredVMs(Map<Integer, LocalVirtualMachine> map) {
139139
String name = vmid.toString(); // default to pid if name not available
140140
boolean attachable = false;
141141
String address = null;
142-
try {
143-
MonitoredVm mvm = host.getMonitoredVm(new VmIdentifier(name));
144-
// use the command line as the display name
145-
name = MonitoredVmUtil.commandLine(mvm);
146-
attachable = MonitoredVmUtil.isAttachable(mvm);
147-
address = ConnectorAddressLink.importFrom(pid);
148-
mvm.detach();
149-
} catch (Exception x) {
150-
// ignore
151-
}
152142
map.put((Integer) vmid,
153143
new LocalVirtualMachine(pid, name, attachable, address));
154144
}

0 commit comments

Comments
 (0)