# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1404848146 -7200
# Node ID 84a14e69fa8b4dd6fd7a7f88cde2d462df71e00f
# Parent  775660e1acbcc618643a8d3fe5dc2871559f956a
added missing check for pending exception

diff -r 775660e1acbc -r 84a14e69fa8b src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Tue Jul 08 21:29:13 2014 +0200
+++ b/src/share/vm/runtime/thread.cpp	Tue Jul 08 21:35:46 2014 +0200
@@ -3679,7 +3679,9 @@
   // anymore. We call vm_exit_during_initialization directly instead.
   SystemDictionary::compute_java_system_loader(THREAD);
 #ifdef GRAAL
-  SystemDictionary::initialize_preloaded_graal_classes(THREAD);
+  if (!HAS_PENDING_EXCEPTION) {
+    SystemDictionary::initialize_preloaded_graal_classes(THREAD);
+  }
 #endif
   if (HAS_PENDING_EXCEPTION) {
     vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));