8262518: SwingNode.setContent does not close previous content, result…

…ing in memory leak Reviewed-by: angorya, jhendrikx
openjdk · Aug 29, 2023 · beca88c · beca88c · openjdk-notifier · Aug 29, 2023
1 parent 53682dd
commit beca88c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java b/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java
@@ -89,6 +89,16 @@ public static WeakReference addRecord(Object target, DisposerRecord rec) {
         return ref;
     }
 
+    /**
+     * Unregisters a previously registered {@link DisposerRecord}, removing it
+     * from the list of records to dispose off when the
+     * original target goes out of scope
+     * @param ref Weak reference of the object to be removed
+     */
+    public static void removeRecord(WeakReference ref) {
+        disposerInstance.records.remove(ref);
+    }
+
     @Override
     public void run() {
         while (true) {

diff --git a/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java b/modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java
@@ -70,6 +70,7 @@
 import com.sun.javafx.scene.NodeHelper;
 import static javafx.stage.WindowEvent.WINDOW_HIDDEN;
 
+import com.sun.javafx.embed.swing.DisposerRecord;
 import com.sun.javafx.embed.swing.SwingNodeHelper;
 import com.sun.javafx.embed.swing.SwingEvents;
 import com.sun.javafx.embed.swing.newimpl.SwingNodeInteropN;
@@ -251,6 +252,8 @@ private ReentrantLock getPaintLock() {
     private boolean grabbed; // lwframe initiated grab
     private Timer deactivate; // lwFrame deactivate delay for Linux
     private SwingNodeInteropN swNodeIOP;
+    private DisposerRecord rec;
+    private WeakReference disposerRecRef;
 
     {
         // To initialize the class helper at the begining each constructor of this class
@@ -361,7 +364,10 @@ public JComponent getContent() {
      */
     private void setContentImpl(JComponent content) {
         if (lwFrame != null) {
-            swNodeIOP.disposeFrame(lwFrame);
+            rec.dispose();
+            Disposer.removeRecord(disposerRecRef);
+            rec = null;
+            disposerRecRef = null;
             lwFrame = null;
         }
         if (content != null) {
@@ -381,7 +387,8 @@ private void setContentImpl(JComponent content) {
             swNodeIOP.setContent(lwFrame, swNodeIOP.createSwingNodeContent(content, this));
             swNodeIOP.setVisible(lwFrame, true);
 
-            Disposer.addRecord(this, swNodeIOP.createSwingNodeDisposer(lwFrame));
+            rec = swNodeIOP.createSwingNodeDisposer(lwFrame);
+            disposerRecRef = Disposer.addRecord(this, rec);
 
             if (getScene() != null) {
                 notifyNativeHandle(getScene().getWindow());