Ensure isVirtual is cached

AlanBateman · AlanBateman · commit c3398fa21f36 · 2022-03-22T06:15:12.000Z
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java
@@ -612,20 +612,17 @@ public boolean isVirtual() {
         if (isVirtualCached) {
             return isVirtual;
         }
+        boolean result = false;
         if (vm.mayCreateVirtualThreads()) {
-            boolean result;
             try {
                 result = JDWP.ThreadReference.IsVirtual.process(vm, this).isVirtual;
             } catch (JDWPException exc) {
                 throw exc.toJDIException();
             }
-            isVirtual = result;
-            return result;
-        } else {
-            isVirtual = false;
-            isVirtualCached = true;
-            return false;
         }
+        isVirtual = result;
+        isVirtualCached = true;
+        return result;
     }
 
     public String toString() {

Original file line number	Diff line number	Diff line change
`@@ -612,20 +612,17 @@ public boolean isVirtual() {`
`612`	`612`	`if (isVirtualCached) {`
`613`	`613`	`return isVirtual;`
`614`	`614`	`}`
	`615`	`+ boolean result = false;`
`615`	`616`	`if (vm.mayCreateVirtualThreads()) {`
`616`		`- boolean result;`
`617`	`617`	`try {`
`618`	`618`	`result = JDWP.ThreadReference.IsVirtual.process(vm, this).isVirtual;`
`619`	`619`	`} catch (JDWPException exc) {`
`620`	`620`	`throw exc.toJDIException();`
`621`	`621`	`}`
`622`		`- isVirtual = result;`
`623`		`- return result;`
`624`		`- } else {`
`625`		`- isVirtual = false;`
`626`		`- isVirtualCached = true;`
`627`		`- return false;`
`628`	`622`	`}`
	`623`	`+ isVirtual = result;`
	`624`	`+ isVirtualCached = true;`
	`625`	`+ return result;`
`629`	`626`	`}`
`630`	`627`
`631`	`628`	`public String toString() {`