# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1403902827 -7200
# Node ID 7af7db0bbfe93bfecd81f233dcb4e356815cd1a6
# Parent  60c3f610183ee8b0d6ec558274a4391a07884ce5
handle unwinding exception through recursive call properly

diff -r 60c3f610183e -r 7af7db0bbfe9 src/share/vm/graal/graalRuntime.cpp
--- a/src/share/vm/graal/graalRuntime.cpp	Fri Jun 27 22:58:54 2014 +0200
+++ b/src/share/vm/graal/graalRuntime.cpp	Fri Jun 27 23:00:27 2014 +0200
@@ -778,9 +778,8 @@
   if (!recognized) {
     bool throw_err = hotSpotOptionsClass.is_null();
     if (!hotSpotOptionsClass.is_null()) {
-      instanceKlassHandle ikh(hotSpotOptionsClass());
-      if (!ikh->is_reentrant_initialization(THREAD)) {
-        set_option_helper(hotSpotOptionsClass, name, name_len, Handle(), ' ', Handle(), 0L);
+      set_option_helper(hotSpotOptionsClass, name, name_len, Handle(), ' ', Handle(), 0L);
+      if (!HAS_PENDING_EXCEPTION) {
         throw_err = true;
       }
     }