*** old/src/share/vm/runtime/jniHandles.cpp	Mon Jun 21 13:37:01 2010
--- new/src/share/vm/runtime/jniHandles.cpp	Mon Jun 21 13:37:01 2010

*** 64,73 ****
--- 64,74 ----
    }
  }
  
  
  jobject JNIHandles::make_global(Handle obj) {
+   assert(!Universe::heap()->is_gc_active(), "can't extend the root set during GC");
    jobject res = NULL;
    if (!obj.is_null()) {
      // ignore null handles
      MutexLocker ml(JNIGlobalHandle_lock);
      assert(Universe::heap()->is_in_reserved(obj()), "sanity check");

*** 79,88 ****
--- 80,90 ----
    return res;
  }
  
  
  jobject JNIHandles::make_weak_global(Handle obj) {
+   assert(!Universe::heap()->is_gc_active(), "can't extend the root set during GC");
    jobject res = NULL;
    if (!obj.is_null()) {
      // ignore null handles
      MutexLocker ml(JNIGlobalHandle_lock);
      assert(Universe::heap()->is_in_reserved(obj()), "sanity check");