Mercurial > hg > truffle

changeset 4666:82fda7201cd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Christian Haeubl <christian.haeubl@oracle.com>
date Tue, 21 Feb 2012 11:01:45 -0800
parents 60a8f52c0be0 (current diff) f9811bcf3402 (diff)
children 35b2cae45dc5
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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, "");