--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp	Tue Feb 07 12:34:31 2012 -0800
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp	Thu Feb 09 00:51:47 2012 -0800
@@ -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")                                   \

--- a/hotspot/src/share/vm/utilities/preserveException.cpp	Tue Feb 07 12:34:31 2012 -0800
+++ b/hotspot/src/share/vm/utilities/preserveException.cpp	Thu Feb 09 00:51:47 2012 -0800
@@ -32,9 +32,9 @@
   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
 }