46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
--- icedtea-3.8.0/openjdk/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java 2018-09-18 10:01:25.012207276 +0200
|
|
+++ icedtea-3.8.0/openjdk/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java 2018-09-18 10:01:45.616319435 +0200
|
|
@@ -674,20 +674,18 @@
|
|
versionInfo().jdwpMinor >= 6;
|
|
}
|
|
public boolean canGetInstanceInfo() {
|
|
- if (versionInfo().jdwpMajor < 1 ||
|
|
- versionInfo().jdwpMinor < 6) {
|
|
- return false;
|
|
- }
|
|
+ if (versionInfo().jdwpMajor > 1 ||
|
|
+ versionInfo().jdwpMinor >= 6) {
|
|
validateVM();
|
|
return hasNewCapabilities() &&
|
|
capabilitiesNew().canGetInstanceInfo;
|
|
- }
|
|
- public boolean canUseSourceNameFilters() {
|
|
- if (versionInfo().jdwpMajor < 1 ||
|
|
- versionInfo().jdwpMinor < 6) {
|
|
+ } else {
|
|
return false;
|
|
}
|
|
- return true;
|
|
+ }
|
|
+ public boolean canUseSourceNameFilters() {
|
|
+ return versionInfo().jdwpMajor > 1 ||
|
|
+ versionInfo().jdwpMinor >= 6;
|
|
}
|
|
public boolean canForceEarlyReturn() {
|
|
validateVM();
|
|
@@ -703,12 +701,8 @@
|
|
capabilitiesNew().canGetSourceDebugExtension;
|
|
}
|
|
public boolean canGetClassFileVersion() {
|
|
- if ( versionInfo().jdwpMajor < 1 &&
|
|
- versionInfo().jdwpMinor < 6) {
|
|
- return false;
|
|
- } else {
|
|
- return true;
|
|
- }
|
|
+ return versionInfo().jdwpMajor > 1 ||
|
|
+ versionInfo().jdwpMinor >= 6;
|
|
}
|
|
public boolean canGetConstantPool() {
|
|
validateVM();
|