From f1fd7e28fe627b3b88bcca01737b71bd60f0aed9 Mon Sep 17 00:00:00 2001
From: Keith Randall <keith.randall@gmail.com>
Date: Wed, 18 Nov 2009 11:12:28 -0800
Subject: [PATCH] 6892742: Improve root set used by jhat

Reviewed-by: tbell, dcubed
---
 .../classes/com/sun/tools/hat/internal/model/JavaStatic.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java b/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java
index 36f4e0e228d..86064914ea6 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java
@@ -57,7 +57,10 @@ public class JavaStatic {
             id = ((JavaObjectRef)value).getId();
         }
         value = value.dereference(snapshot, field);
-        if (value.isHeapAllocated()) {
+        if (value.isHeapAllocated() &&
+            clazz.getLoader() == snapshot.getNullThing()) {
+            // static fields are only roots if they are in classes
+            //    loaded by the root classloader.
             JavaHeapObject ho = (JavaHeapObject) value;
             String s = "Static reference from " + clazz.getName()
                        + "." + field.getName();