changeset 4639:2855c491e2bd

Fix NPE in DebugValueMap.group
author Andreas Woess <andreas.woess@jku.at>
date Sun, 19 Feb 2012 04:28:40 +0100
parents a9181b59a6bf
children 8aa283b5e173 5d9013afbfff
files graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugValueMap.java
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugValueMap.java	Fri Feb 17 16:03:09 2012 -0800
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugValueMap.java	Sun Feb 19 04:28:40 2012 +0100
@@ -140,10 +140,12 @@
     }
 
     public void group() {
-        List<DebugValueMap> oldChildren = new ArrayList<>(this.children);
-        this.children.clear();
-        for (DebugValueMap map : oldChildren) {
-            mergeWith(map);
+        if (this.hasChildren()) {
+            List<DebugValueMap> oldChildren = new ArrayList<>(this.children);
+            this.children.clear();
+            for (DebugValueMap map : oldChildren) {
+                mergeWith(map);
+            }
         }
     }
 }