infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8366101: Replace the use of ThreadTracker with ScopedValue in java.util.jar.JarFile

Browse Source 
Reviewed-by: vyazici, alanb
This commit is contained in:
Jaikiran Pai 2025-12-03 09:17:08 +00:00
parent b3e063c2c3
commit e65fd45dc7
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/java.base/share/classes/java/util/jar/JarFile.java
View File

@ -27,7 +27,6 @@ package java.util.jar;
import jdk.internal.access.SharedSecrets;
import jdk.internal.access.JavaUtilZipFileAccess;
import jdk.internal.misc.ThreadTracker;
import sun.security.util.ManifestEntryVerifier;
import sun.security.util.SignatureFileVerifier;
@ -213,6 +212,9 @@ public class JarFile extends ZipFile {
*/
static final String INDEX_NAME = "META-INF/INDEX.LIST";
// this will be set when the thread is initializing a JAR verifier
private static final ScopedValue<Boolean> IN_VERIFIER_INIT = ScopedValue.newInstance();
/**
* Returns the version that represents the unversioned configuration of a
* multi-release jar file.
@ -1025,36 +1027,30 @@ public class JarFile extends ZipFile {
}
}
private static class ThreadTrackHolder {
static final ThreadTracker TRACKER = new ThreadTracker();
}
private static Object beginInit() {
return ThreadTrackHolder.TRACKER.begin();
}
private static void endInit(Object key) {
ThreadTrackHolder.TRACKER.end(key);
}
synchronized void ensureInitialization() {
try {
maybeInstantiateVerifier();
} catch (IOException e) {
throw new RuntimeException(e);
}
if (jv != null && !jvInitialized) {
Object key = beginInit();
try {
if (jv == null || jvInitialized) {
return;
}
// mark the current thread as initializing
// the JAR verifier
ScopedValue.where(IN_VERIFIER_INIT, true).run(new Runnable() {
@Override
public void run() {
initializeVerifier();
jvInitialized = true;
} finally {
endInit(key);
}
}
});
}
/**
* {@return true if the current thread is initializing a JAR verifier, false otherwise}
*/
static boolean isInitializing() {
return ThreadTrackHolder.TRACKER.contains(Thread.currentThread());
return IN_VERIFIER_INIT.isBound();
}
}