src/share/vm/prims/jvmtiThreadState.cpp

@@ -48,12 +48,11 @@
 
 JvmtiThreadState::JvmtiThreadState(JavaThread* thread)
   : _thread_event_enable() {
   assert(JvmtiThreadState_lock->is_locked(), "sanity check");
   _thread               = thread;
-  _exception_detected   = false;
-  _exception_caught     = false;
+  _exception_state      = ES_CLEARED;
   _debuggable           = true;
   _hide_single_stepping = false;
   _hide_level           = 0;
   _pending_step_for_popframe = false;
   _class_being_redefined = NULL;

@@ -308,11 +307,11 @@
   // exception state is passed in MethodExit event which may be sent at some
   // time in the future. JDWP agent ignores MethodExit events if caused by
   // an exception.
   //
   if (is_exception_detected()) {
-    clear_exception_detected();
+    clear_exception_state();
   }
   // If step is pending for popframe then it may not be
   // a repeat step. The new_bci and method_id is same as current_bci
   // and current method_id after pop and step for recursive calls.
   // Force the step by clearing the last location.

@@ -383,11 +382,11 @@
   // exception state is passed in MethodExit event which may be sent at some
   // time in the future. JDWP agent ignores MethodExit events if caused by
   // an exception.
   //
   if (is_exception_detected()) {
-    clear_exception_detected();
+    clear_exception_state();
   }
   // If step is pending for earlyret then it may not be a repeat step.
   // The new_bci and method_id is same as current_bci and current
   // method_id after earlyret and step for recursive calls.
   // Force the step by clearing the last location.