From 036016d0b6147a38b02f48d0cd4327a40495b447 Mon Sep 17 00:00:00 2001
From: minqi <unknown>
Date: Thu, 9 Feb 2012 00:51:47 -0800
Subject: [PATCH] 7131006: java/lang/management/ThreadMXBean/ThreadLists.java
 Reviewed-by: dholmes, acorn

---
 src/share/vm/classfile/vmSymbols.hpp         | 1 +
 src/share/vm/utilities/preserveException.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/share/vm/classfile/vmSymbols.hpp b/src/share/vm/classfile/vmSymbols.hpp
index 40f36ad66..d6ed1def5 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 ea9ff309e..0248eed10 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
 }
 
 
-- 
GitLab