reuse JMX connection (via ProxyClient) in JMXModelImpl

Author: thurka

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

@@ -57,6 +57,7 @@ public final class JmxApplication extends Application {
     // hard reference jvm from application so we are sure that it is not garbage collected
     public Jvm jvm;
     JmxModel jmxModel;
+    ProxyClient client;
 
     // Note: storage may be null, in this case the JmxApplication isn't persistent
     // and creates a temporary storage just like any other regular Application
@@ -102,6 +103,7 @@ public void setStateImpl(int newState) {
             pid = UNKNOWN_PID;
             jvm = null;
             jmxModel = null;
+            client = null;
         }
         setState(newState);
     }
@@ -144,4 +146,12 @@ private static String createId(JMXServiceURL url, EnvironmentProvider envProvide
         // Typically 'username-service:jmx:rmi:///jndi/rmi://hostName:portNum/jmxrmi'
         return envId + "-" + urlId; // NOI18N
     }
+
+    ProxyClient getProxyClient() {
+        return client;
+    }
+
+    void setClient(ProxyClient client) {
+        this.client = client;
+    }
 }

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

@@ -62,6 +62,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.management.remote.JMXServiceURL;
 import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
@@ -94,6 +96,8 @@ public class JmxApplicationProvider {
     //
     // -------------------------------------------------------------------------
 
+    private final static Logger LOGGER = Logger.getLogger(ProxyClient.class.getName());
+
     private static final String SNAPSHOT_VERSION = "snapshot_version";  // NOI18N
     private static final String SNAPSHOT_VERSION_DIVIDER = ".";         // NOI18N
     private static final String CURRENT_SNAPSHOT_VERSION_MAJOR = "1";   // NOI18N
@@ -400,10 +404,20 @@ private void scheduleHeartbeatImpl(boolean immediately) {
                 @Override
                 public void run() {
                     try {
-                        JmxModel model = new JmxModelProvider().createModelFor(app);
-                        if (model == null || model.getConnectionState() != ConnectionState.CONNECTED) {
+                        boolean connected = false;
+                        try {
+                            ProxyClient client = new ProxyClient(app);
+                            client.connect();
+                            if (client.getConnectionState() == ConnectionState.CONNECTED) {
+                                app.setClient(client);
+                                connected = true;
+                            }
+                        } catch (IOException ex) {
+                            LOGGER.log(Level.FINE, "ProxyClient.connect", ex);
+                        }
+                        if (!connected) {
                             synchronized (unavailableApps) { unavailableApps.add(app); }
-                        } else {                        
+                        } else {
                             app.setStateImpl(Stateful.STATE_AVAILABLE);
 
                             app.jmxModel = JmxModelFactory.getJmxModelFor(app);