Fixed NPE when opening a JDBC .nps snapshot

 - added icon for JDBC snapshots

Author: jisedlac

visualvm/profiling/src/com/sun/tools/visualvm/profiling/snapshot/ProfilerSnapshot.java

@@ -47,6 +47,8 @@ public abstract class ProfilerSnapshot extends Snapshot {
 
     static final Image CPU_ICON = Icons.getImage(ProfilerIcons.CPU);
     static final Image MEMORY_ICON = Icons.getImage(ProfilerIcons.MEMORY);
+    static final Image JDBC_ICON = Icons.getImage(ProfilerIcons.SQL_QUERY);
+    static final Image SNAPSHOT_ICON = Icons.getImage(ProfilerIcons.SNAPSHOT_DO);
     static final Image NODE_BADGE = ImageUtilities.loadImage(
             "com/sun/tools/visualvm/core/ui/resources/snapshotBadge.png", true);    // NOI18N
 

visualvm/profiling/src/com/sun/tools/visualvm/profiling/snapshot/ProfilerSnapshotNPS.java

@@ -83,18 +83,23 @@ protected void remove() {
     protected Image resolveIcon() {
         try {
             int snapshotType = getLoadedSnapshot().getType();
-            if (snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_CPU) {
-                return ImageUtilities.mergeImages(CPU_ICON, NODE_BADGE, 0, 0);
-            } else if (snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_LIVENESS
-                    || snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_ALLOCATIONS
-                    || snapshotType == LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_SAMPLED) {
-                return ImageUtilities.mergeImages(MEMORY_ICON, NODE_BADGE, 0, 0);
-            } else {
-                return null;
+            switch (snapshotType) {
+                case LoadedSnapshot.SNAPSHOT_TYPE_CPU:
+                    return ImageUtilities.mergeImages(CPU_ICON, NODE_BADGE, 0, 0);
+                case LoadedSnapshot.SNAPSHOT_TYPE_CPU_JDBC:
+                    return ImageUtilities.mergeImages(JDBC_ICON, NODE_BADGE, 0, 0);
+                case LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_LIVENESS:
+                case LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_ALLOCATIONS:
+                case LoadedSnapshot.SNAPSHOT_TYPE_MEMORY_SAMPLED:
+                    return ImageUtilities.mergeImages(MEMORY_ICON, NODE_BADGE, 0, 0);
+                default:
+                    // Fallback icon, cannot return null - throws NPE in DataSourceView
+                    return ImageUtilities.mergeImages(SNAPSHOT_ICON, NODE_BADGE, 0, 0);
             }
         } catch (Exception e) {
             LOGGER.log(Level.FINE, "Failed to determine profiler snapshot type", e);  // NOI18N
-            return null;
+            // Fallback icon, cannot return null - throws NPE in DataSourceView
+            return ImageUtilities.mergeImages(SNAPSHOT_ICON, NODE_BADGE, 0, 0);
         }
     }