# HG changeset patch
# User acorn
# Date 1237207853 14400
# Node ID 8ce995316d100af82418396a159f20107207fc5c
# Parent  2581d90c6c9b2012da930eb4742add94a03069a0# Parent  54782a4cd321efc2c643506b6c109c0d02a3ed90
Merge

diff -r 2581d90c6c9b -r 8ce995316d10 agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Thu Mar 12 18:17:25 2009 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Mon Mar 16 08:50:53 2009 -0400
@@ -342,11 +342,13 @@
       throw new RuntimeException("Attempt to initialize VM twice");
     }
     soleInstance = new VM(db, debugger, debugger.getMachineDescription().isBigEndian());
-    debugger.putHeapConst(Universe.getHeapBase(), soleInstance.getHeapOopSize(),
-                          soleInstance.logMinObjAlignmentInBytes);
+
     for (Iterator iter = vmInitializedObservers.iterator(); iter.hasNext(); ) {
       ((Observer) iter.next()).update(null, null);
     }
+
+    debugger.putHeapConst(Universe.getHeapBase(), soleInstance.getHeapOopSize(),
+                        soleInstance.logMinObjAlignmentInBytes);
   }
 
   /** This is used by the debugging system */