GH-595 handle null field value

thurka · thurka · commit 3aa8520076b1 · 2024-08-01T15:11:07.000+02:00
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsPlugin.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsPlugin.java
@@ -607,6 +607,9 @@ public int hashCode() {
             return getInstance() == null ? 37 : super.hashCode();
         }
         
+        public boolean isLeaf() {
+            return valuesCount == 0;
+        }
         
         abstract String fieldName();
         
@@ -643,6 +646,7 @@ protected ProgressIterator<Instance> objectsIterator(int index, final Progress _
                         protected boolean exclude(Instance instance) {
                             _progress.step();
                             FieldValue value = getValueOfField(instance, fieldName);
+                            if (value == null) return _instance != null;
                             if (!(value instanceof ObjectFieldValue)) return true;
                             return !Objects.equals(_instance, ((ObjectFieldValue)value).getInstance());
                         }

Original file line number	Diff line number	Diff line change
`@@ -607,6 +607,9 @@ public int hashCode() {`
`607`	`607`	`return getInstance() == null ? 37 : super.hashCode();`
`608`	`608`	`}`
`609`	`609`
	`610`	`+ public boolean isLeaf() {`
	`611`	`+ return valuesCount == 0;`
	`612`	`+ }`
`610`	`613`
`611`	`614`	`abstract String fieldName();`
`612`	`615`
`@@ -643,6 +646,7 @@ protected ProgressIterator<Instance> objectsIterator(int index, final Progress _`
`643`	`646`	`protected boolean exclude(Instance instance) {`
`644`	`647`	`_progress.step();`
`645`	`648`	`FieldValue value = getValueOfField(instance, fieldName);`
	`649`	`+ if (value == null) return _instance != null;`
`646`	`650`	`if (!(value instanceof ObjectFieldValue)) return true;`
`647`	`651`	`return !Objects.equals(_instance, ((ObjectFieldValue)value).getInstance());`
`648`	`652`	`}`