Use WeakListeners in ApplicationDescriptor implementations to prevent leaks when models are cleared.

Author: jisedlac

visualvm/application/src/org/graalvm/visualvm/application/ApplicationDescriptor.java

@@ -36,6 +36,7 @@
 import java.beans.PropertyChangeSupport;
 import org.graalvm.visualvm.core.datasupport.Stateful;
 import org.graalvm.visualvm.core.datasupport.Utils;
+import org.openide.util.WeakListeners;
 
 /**
  * DataSourceDescriptor for Application.
@@ -98,11 +99,12 @@ public boolean providesProperties() {
 
 
     protected void setApplicationType(ApplicationType type) {
-        if (this.type != null) this.type.removePropertyChangeListener(this);
+//        if (this.type != null) this.type.removePropertyChangeListener(this);
 
         this.type = type;
 
-        this.type.addPropertyChangeListener(this);
+        this.type.addPropertyChangeListener(WeakListeners.propertyChange(this, this.type));
+//        this.type.addPropertyChangeListener(this);
     }
 
     protected ApplicationType getApplicationType() {

visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxApplicationDescriptor.java

@@ -37,6 +37,7 @@
 import org.graalvm.visualvm.core.datasupport.Stateful;
 import org.graalvm.visualvm.core.datasupport.Utils;
 import org.openide.util.ImageUtilities;
+import org.openide.util.WeakListeners;
 
 /**
  *
@@ -51,7 +52,8 @@ public class JmxApplicationDescriptor extends ApplicationDescriptor {
     protected JmxApplicationDescriptor(JmxApplication application) {
         super(application, resolveApplicationType(application), resolvePosition(application, POSITION_AT_THE_END, true));
 
-        application.addPropertyChangeListener(Stateful.PROPERTY_STATE, this);
+        application.addPropertyChangeListener(Stateful.PROPERTY_STATE, WeakListeners.propertyChange(this, Stateful.PROPERTY_STATE, application));
+//        application.addPropertyChangeListener(Stateful.PROPERTY_STATE, this);
     }
 
     public boolean supportsRename() {