Merge pull request #20600 from JasonFengJ9/disablesm2

pshipton · web-flow · commit 7d1ffb0ecb43 · 2024-11-15T17:04:04.000-05:00
JDK24 removes AccessControlContext references
diff --git a/jcl/src/java.base/share/classes/java/lang/Access.java b/jcl/src/java.base/share/classes/java/lang/Access.java
@@ -169,11 +169,13 @@ public java.lang.StackTraceElement getStackTraceElement(java.lang.Throwable arg0
 		return arg0.getInternalStackTrace()[arg1];
 	}
 
+/*[IF JAVA_SPEC_VERSION < 24]*/
 	/*[PR CMVC 199693] Prevent trusted method chain attack. */
 	@SuppressWarnings("removal")
 	public Thread newThreadWithAcc(Runnable runnable, AccessControlContext acc) {
 		return new Thread(runnable, acc);
 	}
+/*[ENDIF] JAVA_SPEC_VERSION < 24 */
 
 	/**
 	 * Returns a directly present annotation instance of annotationClass type from clazz.

Original file line number	Diff line number	Diff line change
`@@ -169,11 +169,13 @@ public java.lang.StackTraceElement getStackTraceElement(java.lang.Throwable arg0`
`169`	`169`	`return arg0.getInternalStackTrace()[arg1];`
`170`	`170`	`}`
`171`	`171`
	`172`	`+/[IF JAVA_SPEC_VERSION < 24]/`
`172`	`173`	`/[PR CMVC 199693] Prevent trusted method chain attack. /`
`173`	`174`	`@SuppressWarnings("removal")`
`174`	`175`	`public Thread newThreadWithAcc(Runnable runnable, AccessControlContext acc) {`
`175`	`176`	`return new Thread(runnable, acc);`
`176`	`177`	`}`
	`178`	`+/[ENDIF] JAVA_SPEC_VERSION < 24 /`
`177`	`179`
`178`	`180`	`/**`
`179`	`181`	`* Returns a directly present annotation instance of annotationClass type from clazz.`