Merge pull request #19925 from keithc-ca/executeOnCarrierThread

tajila · web-flow · commit 48f557e42619 · 2024-07-29T10:22:41.000-04:00
JDK24 removes JavaLangAccess.executeOnCarrierThread()
diff --git a/jcl/src/java.base/share/classes/java/lang/Access.java b/jcl/src/java.base/share/classes/java/lang/Access.java
@@ -595,6 +595,7 @@ public Thread currentCarrierThread() {
 		return Thread.currentCarrierThread();
 	}
 
+	/*[IF JAVA_SPEC_VERSION < 24]*/
 	public <V> V executeOnCarrierThread(Callable<V> task) throws Exception {
 		V result;
 		Thread currentThread = Thread.currentThread();
@@ -611,6 +612,7 @@ public <V> V executeOnCarrierThread(Callable<V> task) throws Exception {
 		}
 		return result;
 	}
+	/*[ENDIF] JAVA_SPEC_VERSION < 24 */
 
 	public Continuation getContinuation(Thread thread) {
 		return thread.getContinuation();

Original file line number	Diff line number	Diff line change
`@@ -595,6 +595,7 @@ public Thread currentCarrierThread() {`
`595`	`595`	`return Thread.currentCarrierThread();`
`596`	`596`	`}`
`597`	`597`
	`598`	`+ /[IF JAVA_SPEC_VERSION < 24]/`
`598`	`599`	`public <V> V executeOnCarrierThread(Callable<V> task) throws Exception {`
`599`	`600`	`V result;`
`600`	`601`	`Thread currentThread = Thread.currentThread();`
`@@ -611,6 +612,7 @@ public <V> V executeOnCarrierThread(Callable<V> task) throws Exception {`
`611`	`612`	`}`
`612`	`613`	`return result;`
`613`	`614`	`}`
	`615`	`+ /[ENDIF] JAVA_SPEC_VERSION < 24 /`
`614`	`616`
`615`	`617`	`public Continuation getContinuation(Thread thread) {`
`616`	`618`	`return thread.getContinuation();`