# HG changeset patch
# User Christian Haeubl <christian.haeubl@oracle.com>
# Date 1329850905 28800
# Node ID 82fda7201cd6fce3fd1db1a3f3178327c8340991
# Parent  60a8f52c0be04f1e3e47922020d6474b8fa15501# Parent  f9811bcf3402da82f52ebae904cb62c6ba499de6
Merge

diff -r 60a8f52c0be0 -r 82fda7201cd6 src/share/vm/runtime/sharedRuntime.cpp
--- a/src/share/vm/runtime/sharedRuntime.cpp	Tue Feb 21 19:35:51 2012 +0100
+++ b/src/share/vm/runtime/sharedRuntime.cpp	Tue Feb 21 11:01:45 2012 -0800
@@ -718,6 +718,7 @@
     nm->make_not_entrant();
     JavaThread::current()->set_exception_pc(ret_pc);
     JavaThread::current()->set_exception_oop(exception());
+    JavaThread::current()->clear_pending_exception();
     return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls();
 #else
     assert(nm->unwind_handler_begin() != NULL, "");