GH-412 call createPresentationCCT() only if classId exists in particular snapshot

Author: thurka

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/JdbcResultsDiff.java

@@ -109,8 +109,17 @@ public void writeToStream(DataOutputStream out) throws IOException {
     @Override
     protected PresoObjAllocCCTNode createPresentationCCT(RuntimeMemoryCCTNode rootNode, int classId,
                                                          boolean dontShowZeroLiveObjAllocPaths) {
-        PresoObjAllocCCTNode node1 = snapshot1.createPresentationCCT(rootNode, selectId1(classId), dontShowZeroLiveObjAllocPaths);
-        PresoObjAllocCCTNode node2 = snapshot2.createPresentationCCT(rootNode, selectId2(classId), dontShowZeroLiveObjAllocPaths);
+        int selectId1 = selectId1(classId);
+        int selectId2 = selectId2(classId);
+        PresoObjAllocCCTNode node1 = null;
+        PresoObjAllocCCTNode node2 = null;
+
+        if (selectId1 != -1) {
+            node1 = snapshot1.createPresentationCCT(rootNode, selectId1, dontShowZeroLiveObjAllocPaths);
+        }
+        if (selectId2 != -1) {
+            node2 = snapshot2.createPresentationCCT(rootNode, selectId2, dontShowZeroLiveObjAllocPaths);
+        }
         return new DiffObjAllocCCTNode(node1, node2);
     }
 

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/AllocMemoryResultsDiff.java

@@ -110,8 +110,17 @@ public boolean containsStacks() {
     }
 
     public PresoObjAllocCCTNode createPresentationCCT(int classId, boolean dontShowZeroLiveObjAllocPaths) {
-        PresoObjAllocCCTNode node1 = snapshot1.createPresentationCCT(classId1(classId), dontShowZeroLiveObjAllocPaths);
-        PresoObjAllocCCTNode node2 = snapshot2.createPresentationCCT(classId2(classId), dontShowZeroLiveObjAllocPaths);
+        int selectId1 = classId1(classId);
+        int selectId2 = classId2(classId);
+        PresoObjAllocCCTNode node1 = null;
+        PresoObjAllocCCTNode node2 = null;
+
+        if (selectId1 != -1) {
+            node1 = snapshot1.createPresentationCCT(selectId1, dontShowZeroLiveObjAllocPaths);
+        }
+        if (selectId2 != -1) {
+            node2 = snapshot2.createPresentationCCT(selectId2, dontShowZeroLiveObjAllocPaths);
+        }
         return new DiffObjAllocCCTNode(node1, node2);
     }
 
@@ -126,8 +135,17 @@ public void writeToStream(DataOutputStream out) throws IOException {
 
     protected PresoObjAllocCCTNode createPresentationCCT(RuntimeMemoryCCTNode rootNode, int classId,
                                                          boolean dontShowZeroLiveObjAllocPaths) {
-        PresoObjAllocCCTNode node1 = snapshot1.createPresentationCCT(rootNode, classId1(classId), dontShowZeroLiveObjAllocPaths);
-        PresoObjAllocCCTNode node2 = snapshot2.createPresentationCCT(rootNode, classId2(classId), dontShowZeroLiveObjAllocPaths);
+        int selectId1 = classId1(classId);
+        int selectId2 = classId2(classId);
+        PresoObjAllocCCTNode node1 = null;
+        PresoObjAllocCCTNode node2 = null;
+
+        if (selectId1 != -1) {
+            node1 = snapshot1.createPresentationCCT(rootNode, selectId1, dontShowZeroLiveObjAllocPaths);
+        }
+        if (selectId2 != -1) {
+            node2 = snapshot2.createPresentationCCT(rootNode, selectId2, dontShowZeroLiveObjAllocPaths);
+        }
         return new DiffObjAllocCCTNode(node1, node2);
     }
 

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/LivenessMemoryResultsDiff.java

@@ -159,8 +159,17 @@ public boolean containsStacks() {
     }
 
     public PresoObjLivenessCCTNode createPresentationCCT(int classId, boolean dontShowZeroLiveObjAllocPaths) {
-        PresoObjLivenessCCTNode node1 = snapshot1.createPresentationCCT(classId1(classId), dontShowZeroLiveObjAllocPaths);
-        PresoObjLivenessCCTNode node2 = snapshot2.createPresentationCCT(classId2(classId), dontShowZeroLiveObjAllocPaths);
+        int selectId1 = classId1(classId);
+        int selectId2 = classId2(classId);
+        PresoObjLivenessCCTNode node1 = null;
+        PresoObjLivenessCCTNode node2 = null;
+
+        if (selectId1 != -1) {
+            node1 = snapshot1.createPresentationCCT(selectId1, dontShowZeroLiveObjAllocPaths);
+        }
+        if (selectId2 != -1) {
+            node2 = snapshot2.createPresentationCCT(selectId2, dontShowZeroLiveObjAllocPaths);
+        }
         return new DiffObjLivenessCCTNode(node1, node2);
     }
 
@@ -179,8 +188,17 @@ public void writeToStream(DataOutputStream out) throws IOException {
 
     protected PresoObjLivenessCCTNode createPresentationCCT(RuntimeMemoryCCTNode rootNode, int classId,
                                                          boolean dontShowZeroLiveObjAllocPaths) {
-        PresoObjLivenessCCTNode node1 = snapshot1.createPresentationCCT(rootNode, classId1(classId), dontShowZeroLiveObjAllocPaths);
-        PresoObjLivenessCCTNode node2 = snapshot2.createPresentationCCT(rootNode, classId2(classId), dontShowZeroLiveObjAllocPaths);
+        int selectId1 = classId1(classId);
+        int selectId2 = classId2(classId);
+        PresoObjLivenessCCTNode node1 = null;
+        PresoObjLivenessCCTNode node2 = null;
+
+        if (selectId1 != -1) {
+            node1 = snapshot1.createPresentationCCT(rootNode, selectId1, dontShowZeroLiveObjAllocPaths);
+        }
+        if (selectId2 != -1) {
+            node2 = snapshot2.createPresentationCCT(rootNode, selectId2, dontShowZeroLiveObjAllocPaths);
+        }
         return new DiffObjLivenessCCTNode(node1, node2);
     }