Skip to content
This repository was archived by the owner on Mar 8, 2024. It is now read-only.

Commit 6424e27

Browse files
committed
JRE-641 Memory view does not work with the remote jdk 9
merged part of the fix 6469bd9 from jdk 9 repo
1 parent d93beea commit 6424e27

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -674,20 +674,18 @@ public boolean canGetMethodReturnValues() {
674674
versionInfo().jdwpMinor >= 6;
675675
}
676676
public boolean canGetInstanceInfo() {
677-
if (versionInfo().jdwpMajor < 1 ||
678-
versionInfo().jdwpMinor < 6) {
677+
if (versionInfo().jdwpMajor > 1 ||
678+
versionInfo().jdwpMinor >= 6) {
679+
validateVM();
680+
return hasNewCapabilities() &&
681+
capabilitiesNew().canGetInstanceInfo;
682+
} else {
679683
return false;
680684
}
681-
validateVM();
682-
return hasNewCapabilities() &&
683-
capabilitiesNew().canGetInstanceInfo;
684685
}
685686
public boolean canUseSourceNameFilters() {
686-
if (versionInfo().jdwpMajor < 1 ||
687-
versionInfo().jdwpMinor < 6) {
688-
return false;
689-
}
690-
return true;
687+
return versionInfo().jdwpMajor > 1 ||
688+
versionInfo().jdwpMinor >= 6;
691689
}
692690
public boolean canForceEarlyReturn() {
693691
validateVM();
@@ -703,12 +701,8 @@ public boolean canGetSourceDebugExtension() {
703701
capabilitiesNew().canGetSourceDebugExtension;
704702
}
705703
public boolean canGetClassFileVersion() {
706-
if ( versionInfo().jdwpMajor < 1 &&
707-
versionInfo().jdwpMinor < 6) {
708-
return false;
709-
} else {
710-
return true;
711-
}
704+
return versionInfo().jdwpMajor > 1 ||
705+
versionInfo().jdwpMinor >= 6;
712706
}
713707
public boolean canGetConstantPool() {
714708
validateVM();

0 commit comments

Comments
 (0)