*** old/src/share/vm/prims/jvmtiEventController.cpp	Mon Jan 10 12:30:27 2011
--- new/src/share/vm/prims/jvmtiEventController.cpp	Mon Jan 10 12:30:27 2011

*** 665,682 ****
--- 665,681 ----
  
  void
  JvmtiEventControllerPrivate::thread_ended(JavaThread *thread) {
    // Removes the JvmtiThreadState associated with the specified thread.
    // May be called after all environments have been disposed.
+   assert(JvmtiThreadState_lock->is_locked(), "sanity check");
  
    EC_TRACE(("JVMTI [%s] # thread ended", JvmtiTrace::safe_get_thread_name(thread)));
  
    JvmtiThreadState *state = thread->jvmti_thread_state();
    if (state != NULL) {
      MutexLocker mu(JvmtiThreadState_lock);
+   assert(state != NULL, "else why are we here?");
    delete state;
    }
  }
  
  void JvmtiEventControllerPrivate::set_event_callbacks(JvmtiEnvBase *env,
                                                        const jvmtiEventCallbacks* callbacks,
                                                        jint size_of_callbacks) {