# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1417705923 -3600
# Node ID 965f1e08c083427770d3862287f2ca05c457ff88
# Parent  0aec14bcf006d9ce36a76963dbaa49f2166abd81# Parent  56c6eb8f52612addee026baf052ec67fff357569
Merge.

diff -r 56c6eb8f5261 -r 965f1e08c083 src/share/vm/graal/graalRuntime.cpp
--- a/src/share/vm/graal/graalRuntime.cpp	Thu Dec 04 14:38:55 2014 +0100
+++ b/src/share/vm/graal/graalRuntime.cpp	Thu Dec 04 16:12:03 2014 +0100
@@ -770,15 +770,25 @@
     TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/loader/Factory", CHECK_ABORT);
     KlassHandle klass = SystemDictionary::resolve_or_fail(name, true, THREAD);
     if (HAS_PENDING_EXCEPTION) {
-      abort_on_pending_exception(PENDING_EXCEPTION, "Graal classes are not available");
+      static volatile int seen_error = 0;
+      if (!seen_error && Atomic::cmpxchg(1, &seen_error, 0) == 0) {
+        // Only report the failure on the first thread that hits it
+        abort_on_pending_exception(PENDING_EXCEPTION, "Graal classes are not available");
+      } else {
+        CLEAR_PENDING_EXCEPTION;
+        // Give first thread time to report the error.
+        os::sleep(THREAD, 100, false);
+        vm_abort(false);
+      }
     }
+
     TempNewSymbol field_name = SymbolTable::new_symbol("useGraalClassLoader", CHECK_ABORT);
-
     fieldDescriptor field_desc;
     if (klass->find_field(field_name, vmSymbols::bool_signature(), &field_desc) == NULL) {
       ResourceMark rm;
       fatal(err_msg("Invalid layout of %s at %s", field_name->as_C_string(), klass->external_name()));
     }
+
     InstanceKlass* ik = InstanceKlass::cast(klass());
     address addr = ik->static_field_addr(field_desc.offset() - InstanceMirrorKlass::offset_of_static_fields());
     *((jboolean *) addr) = (jboolean) UseGraalClassLoader;