From 3a09f847bb3ab5608fe8416aa51532ed976b57b1 Mon Sep 17 00:00:00 2001 From: Yumin Qi Date: Thu, 9 Feb 2012 00:51:47 -0800 Subject: [PATCH] 7131006: java/lang/management/ThreadMXBean/ThreadLists.java Reviewed-by: dholmes, acorn --- hotspot/src/share/vm/classfile/vmSymbols.hpp | 1 + hotspot/src/share/vm/utilities/preserveException.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp index 40f36ad66cf..d6ed1def52c 100644 --- a/hotspot/src/share/vm/classfile/vmSymbols.hpp +++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp @@ -284,6 +284,7 @@ template(run_method_name, "run") \ template(exit_method_name, "exit") \ template(add_method_name, "add") \ + template(remove_method_name, "remove") \ template(parent_name, "parent") \ template(threads_name, "threads") \ template(groups_name, "groups") \ diff --git a/hotspot/src/share/vm/utilities/preserveException.cpp b/hotspot/src/share/vm/utilities/preserveException.cpp index ea9ff309ec2..0248eed107a 100644 --- a/hotspot/src/share/vm/utilities/preserveException.cpp +++ b/hotspot/src/share/vm/utilities/preserveException.cpp @@ -32,9 +32,9 @@ PreserveExceptionMark::PreserveExceptionMark(Thread*& thread) { thread = Thread::current(); _thread = thread; _preserved_exception_oop = Handle(thread, _thread->pending_exception()); - _thread->clear_pending_exception(); // Needed to avoid infinite recursion _preserved_exception_line = _thread->exception_line(); _preserved_exception_file = _thread->exception_file(); + _thread->clear_pending_exception(); // Needed to avoid infinite recursion }