JvmFactory.getJVMFor() never returns null

Author: thurka

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

@@ -164,7 +164,7 @@ protected static String resolveApplicationName(Application application, Applicat
 
     protected static String resolveCustomName(Application application) {
         Jvm jvm = application.getState() == Stateful.STATE_AVAILABLE ? JvmFactory.getJVMFor(application) : null;
-        if (jvm != null && jvm.isBasicInfoSupported()) {
+        if (jvm.isBasicInfoSupported()) {
             String args = jvm.getJvmArgs();
             int propIndex = args.indexOf(DISPLAY_NAME_PROPERTY);
 

visualvm/applicationviews/src/org/graalvm/visualvm/application/views/monitor/ApplicationMonitorModel.java

@@ -445,25 +445,23 @@ private void initialize(Application application) {
         processorsCount = 1;
 
         jvm = JvmFactory.getJVMFor(application);
-        if (jvm != null) {
-            HeapDumpSupport hds = HeapDumpSupport.getInstance();
-            if (application.isLocalApplication()) {
-                takeHeapDumpSupported = hds.supportsHeapDump(application);
-            } else {
-                takeHeapDumpSupported = hds.supportsRemoteHeapDump(application);
-            }
-            cpuMonitoringSupported = jvm.isCpuMonitoringSupported();
-            gcMonitoringSupported = jvm.isCollectionTimeSupported();
-            memoryMonitoringSupported = jvm.isMemoryMonitoringSupported();
-            classMonitoringSupported = jvm.isClassMonitoringSupported();
-            threadsMonitoringSupported = jvm.isThreadMonitoringSupported();
-            if (memoryMonitoringSupported) {
-                String[] names = jvm.getGenName();
-                heapName = names[0];
-                permgenName = names[1];
-            }
-            processorsCount = jvm.getAvailableProcessors();
+        HeapDumpSupport hds = HeapDumpSupport.getInstance();
+        if (application.isLocalApplication()) {
+            takeHeapDumpSupported = hds.supportsHeapDump(application);
+        } else {
+            takeHeapDumpSupported = hds.supportsRemoteHeapDump(application);
+        }
+        cpuMonitoringSupported = jvm.isCpuMonitoringSupported();
+        gcMonitoringSupported = jvm.isCollectionTimeSupported();
+        memoryMonitoringSupported = jvm.isMemoryMonitoringSupported();
+        classMonitoringSupported = jvm.isClassMonitoringSupported();
+        threadsMonitoringSupported = jvm.isThreadMonitoringSupported();
+        if (memoryMonitoringSupported) {
+            String[] names = jvm.getGenName();
+            heapName = names[0];
+            permgenName = names[1];
         }
+        processorsCount = jvm.getAvailableProcessors();
 
         memoryMXBean = null;
         JmxModel jmxModel = JmxModelFactory.getJmxModelFor(application);

visualvm/applicationviews/src/org/graalvm/visualvm/application/views/threads/ApplicationThreadsView.java

@@ -94,7 +94,7 @@ protected void willBeAdded() {
         if (ds instanceof Application) {
             Application application = (Application)ds;
             Jvm jvm = JvmFactory.getJVMFor(application);
-            takeThreadDumpSupported = jvm == null ? false : jvm.isTakeThreadDumpSupported();
+            takeThreadDumpSupported = jvm.isTakeThreadDumpSupported();
             threadsManager = null;
             JmxModel jmxModel = JmxModelFactory.getJmxModelFor(application);
             if (jmxModel != null && jmxModel.getConnectionState() == ConnectionState.CONNECTED) {

visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemoryModel.java

@@ -284,31 +284,29 @@ private void initialize(Application application) {
                 / preferences.getMonitoredDataPoll();
 
         jvm = JvmFactory.getJVMFor(application);
-        if (jvm != null) {
-            connection = getConnection(application);
-            if (connection != null) {
-                updateValues(System.currentTimeMillis(), getData());
-
-                if (live) {
-                    monitoredDataListener = new MonitoredDataListener() {
-                        long lastTimestamp = -1;
-
-                        public void monitoredDataEvent(final MonitoredData data) {
-                            long timestamp = System.currentTimeMillis();
-                            final long timestampF = lastTimestamp < timestamp
-                                    ? lastTimestamp = timestamp : ++lastTimestamp;
-                            final Object[] values = getData();
-
-                            SwingUtilities.invokeLater(new Runnable() {
-                                public void run() {
-                                    updateValues(timestampF, values);
-                                    fireChange();
-                                }
-                            });
-                        }
-                    };
-                    jvm.addMonitoredDataListener(monitoredDataListener);
-                }
+        connection = getConnection(application);
+        if (connection != null) {
+            updateValues(System.currentTimeMillis(), getData());
+
+            if (live) {
+                monitoredDataListener = new MonitoredDataListener() {
+                    long lastTimestamp = -1;
+
+                    public void monitoredDataEvent(final MonitoredData data) {
+                        long timestamp = System.currentTimeMillis();
+                        final long timestampF = lastTimestamp < timestamp
+                                ? lastTimestamp = timestamp : ++lastTimestamp;
+                        final Object[] values = getData();
+
+                        SwingUtilities.invokeLater(new Runnable() {
+                            public void run() {
+                                updateValues(timestampF, values);
+                                fireChange();
+                            }
+                        });
+                    }
+                };
+                jvm.addMonitoredDataListener(monitoredDataListener);
             }
         }
     }

visualvm/jfr/src/org/graalvm/visualvm/jfr/JFRSnapshotSupport.java

@@ -137,7 +137,7 @@ public static void takeRemoteJfrDump(Application application, String dumpFile, b
     public static boolean supportsJfrDump(Application application) {
         if (application.getState() != Stateful.STATE_AVAILABLE) return false;
         Jvm jvm = JvmFactory.getJVMFor(application);
-        if (jvm == null || !jvm.isJfrAvailable()) return false;
+        if (!jvm.isJfrAvailable()) return false;
         return !jvm.jfrCheck().isEmpty();
     }
 
@@ -166,7 +166,7 @@ public static void remoteJfrStartRecording(Application application) {
     public static boolean supportsJfrStart(Application application) {
         if (application.getState() != Stateful.STATE_AVAILABLE) return false;
         Jvm jvm = JvmFactory.getJVMFor(application);
-        if (jvm == null || !jvm.isJfrAvailable()) return false;
+        if (!jvm.isJfrAvailable()) return false;
         return jvm.jfrCheck().isEmpty();
     }
 
@@ -189,7 +189,7 @@ public static void remoteJfrStopRecording(Application application) {
     public static boolean supportsJfrStop(Application application) {
         if (application.getState() != Stateful.STATE_AVAILABLE) return false;
         Jvm jvm = JvmFactory.getJVMFor(application);
-        if (jvm == null || !jvm.isJfrAvailable()) return false;
+        if (!jvm.isJfrAvailable()) return false;
         return !jvm.jfrCheck().isEmpty();
     }
 

visualvm/jfr/src/org/graalvm/visualvm/jfr/impl/JFRRecordingProvider.java

@@ -169,7 +169,7 @@ public void run() {
                 if (jvm != null) {
                     recordings = jvm.jfrCheck();
                 }
-                if (jvm == null || recordings.isEmpty()) {
+                if (recordings.isEmpty()) {
                     DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(NbBundle.getMessage(JFRRecordingProvider.class,
                             "MSG_Cannot_Take_JFR_dump", DataSourceDescriptorFactory. // NOI18N
                                     getDescriptor(application).getName()), NotifyDescriptor.ERROR_MESSAGE));