# HG changeset patch
# User dcubed
# Date 1274093635 25200
# Node ID 7ccc203eb6ff17a8a37c5c11fa96848afde67846
# Parent  093432aa7573bccea0d301ce70145bbd6fd4e89d# Parent  9d4dd91c4a0a9ae86baa03700d0703c357f34c5b
Merge

diff -r 093432aa7573 -r 7ccc203eb6ff agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java	Thu May 13 17:10:32 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java	Mon May 17 03:53:55 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007-2010 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,9 +78,8 @@
   }
 
   public BitMap bm() {
-    BitMap bitMap = new BitMap((int) (bmWordSize() >> (shifter() + 3) ));
+    BitMap bitMap = new BitMap((int) (bmWordSize() >> shifter() ));
     VirtualSpace vs = virtualSpace();
-    //bitMap.set_size((int)vs.committedSize());
     bitMap.set_map(vs.low());
     return bitMap;
   }
diff -r 093432aa7573 -r 7ccc203eb6ff agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java	Thu May 13 17:10:32 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java	Mon May 17 03:53:55 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2010 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -326,7 +326,13 @@
 
   /** Gets the Java-side thread object for this JavaThread */
   public Oop getThreadObj() {
-    return VM.getVM().getObjectHeap().newOop(threadObjField.getValue(addr));
+    Oop obj = null;
+    try {
+      obj = VM.getVM().getObjectHeap().newOop(threadObjField.getValue(addr));
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return obj;
   }
 
   /** Get the Java-side name of this thread */