Skip to content

Commit 7d7d308

Browse files
committed
8362572: Delete the usage of "sun.java2d.reftype" from the sun.java2d.Disposer
Reviewed-by: prr, aivanov
1 parent eceb3bb commit 7d7d308

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

src/java.desktop/share/classes/sun/java2d/Disposer.java

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,15 @@
2525

2626
package sun.java2d;
2727

28-
import sun.awt.util.ThreadGroupUtils;
29-
28+
import java.lang.ref.PhantomReference;
3029
import java.lang.ref.Reference;
3130
import java.lang.ref.ReferenceQueue;
32-
import java.lang.ref.PhantomReference;
3331
import java.lang.ref.WeakReference;
3432
import java.util.Hashtable;
3533
import java.util.concurrent.ConcurrentLinkedDeque;
3634

35+
import sun.awt.util.ThreadGroupUtils;
36+
3737
/**
3838
* This class is used for registering and disposing the native
3939
* data associated with java objects.
@@ -54,24 +54,11 @@ public class Disposer implements Runnable {
5454
private static final Hashtable<java.lang.ref.Reference<Object>, DisposerRecord> records =
5555
new Hashtable<>();
5656

57-
private static Disposer disposerInstance;
58-
public static final int WEAK = 0;
59-
public static final int PHANTOM = 1;
60-
public static int refType = PHANTOM;
57+
private static final Disposer disposerInstance;
6158

6259
static {
6360
System.loadLibrary("awt");
6461
initIDs();
65-
String type = System.getProperty("sun.java2d.reftype");
66-
if (type != null) {
67-
if (type.equals("weak")) {
68-
refType = WEAK;
69-
System.err.println("Using WEAK refs");
70-
} else {
71-
refType = PHANTOM;
72-
System.err.println("Using PHANTOM refs");
73-
}
74-
}
7562
disposerInstance = new Disposer();
7663
String name = "Java2D Disposer";
7764
ThreadGroup rootTG = ThreadGroupUtils.getRootThreadGroup();
@@ -118,13 +105,7 @@ synchronized void add(Object target, DisposerRecord rec) {
118105
if (target instanceof DisposerTarget) {
119106
target = ((DisposerTarget)target).getDisposerReferent();
120107
}
121-
java.lang.ref.Reference<Object> ref;
122-
if (refType == PHANTOM) {
123-
ref = new PhantomReference<>(target, queue);
124-
} else {
125-
ref = new WeakReference<>(target, queue);
126-
}
127-
records.put(ref, rec);
108+
records.put(new PhantomReference<>(target, queue), rec);
128109
}
129110

130111
public void run() {

0 commit comments

Comments
 (0)