Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK24 removes CleanerImpl.phantomCleanableList #20760

Merged
merged 1 commit into from
Dec 5, 2024
+7 −5
Merged

JDK24 removes CleanerImpl.phantomCleanableList #20760

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions jcl/src/java.base/share/classes/jdk/internal/ref/CleanerShutdown.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
*/
package jdk.internal.ref;

import jdk.internal.ref.CleanerFactory;

import java.lang.ref.Cleaner;
import java.lang.ref.Cleaner.Cleanable;
/*[IF JAVA_SPEC_VERSION < 24]*/
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.PrivilegedAction;
/*[ENDIF] JAVA_SPEC_VERSION < 24 */

@SuppressWarnings("javadoc")
public class CleanerShutdown {
Expand All @@ -47,14 +47,15 @@ public static void shutdownCleaner() {
}
}

/*[IF JAVA_SPEC_VERSION < 24]*/
JasonFengJ9 marked this conversation as resolved.
Show resolved Hide resolved
try {
Method phantomRemove = PhantomCleanable.class.getDeclaredMethod("remove", (Class<?>[]) null); //$NON-NLS-1$
Method phantomRemove = PhantomCleanable.class.getDeclaredMethod("remove"); //$NON-NLS-1$
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
phantomRemove.setAccessible(true);
return null;
});
while(!commonCleanerImpl.phantomCleanableList.isListEmpty()) {
phantomRemove.invoke(commonCleanerImpl.phantomCleanableList, (Object[]) null);
while (!commonCleanerImpl.phantomCleanableList.isListEmpty()) {
phantomRemove.invoke(commonCleanerImpl.phantomCleanableList);
}
} catch (NoSuchMethodException
| SecurityException
Expand All @@ -65,5 +66,6 @@ public static void shutdownCleaner() {
/* should not fail */
e.printStackTrace();
}
/*[ENDIF] JAVA_SPEC_VERSION < 24 */
}
}