stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8255934: JConsole 14 and greater fails to connect to older JVM

Browse Source 
Reviewed-by: cjplummer, sspitsyn
This commit is contained in:
Alex Menkov 2020-11-20 23:33:11 +00:00
parent 86f36027e4
commit 14de791d60
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java
View File

@ -32,6 +32,7 @@ import java.lang.reflect.*;
import java.text.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.function.LongSupplier;
import javax.swing.*;
@ -257,9 +258,14 @@ class SummaryTab extends Tab {
String[] kbStrings1 =
formatKByteStrings(sunOSMBean.getCommittedVirtualMemorySize());
// getTotalPhysicalMemorySize and getFreePhysicalMemorySize are deprecated,
// but we want be able to get the data for old target VMs (see JDK-8255934).
@SuppressWarnings("deprecation")
String[] kbStrings2 =
formatKByteStrings(sunOSMBean.getTotalMemorySize(),
sunOSMBean.getFreeMemorySize(),
formatKByteStrings(tryToGet(sunOSMBean::getTotalMemorySize,
sunOSMBean::getTotalPhysicalMemorySize),
tryToGet(sunOSMBean::getFreeMemorySize,
sunOSMBean::getFreePhysicalMemorySize),
sunOSMBean.getTotalSwapSpaceSize(),
sunOSMBean.getFreeSwapSpaceSize());
@ -317,6 +323,20 @@ class SummaryTab extends Tab {
return result;
}
/**
* Tries to get the specified value from the list of suppliers.
* Returns -1 if all suppliers fail.
*/
private long tryToGet(LongSupplier ... getters) {
for (LongSupplier getter : getters) {
try {
return getter.getAsLong();
} catch (UndeclaredThrowableException e) {
}
}
return -1;
}
private synchronized void append(String str) {
buf.append(str);
}