diff --git a/src/share/vm/classfile/vmSymbols.hpp b/src/share/vm/classfile/vmSymbols.hpp index 40f36ad66cf3053baddf649975a9ab3cda0b2804..d6ed1def52c816051219f9e478f12445a0fee69a 100644 --- a/src/share/vm/classfile/vmSymbols.hpp +++ b/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/src/share/vm/utilities/preserveException.cpp b/src/share/vm/utilities/preserveException.cpp index ea9ff309ec2c5eb44bab7de5dba0c42aa87ef94e..0248eed107a781ac53475c72ac8bde50fb195409 100644 --- a/src/share/vm/utilities/preserveException.cpp +++ b/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 }