# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1407535133 -7200
# Node ID c958f16fd52f52137ede06404bd9747c794eb09f
# Parent  202e54a09a7217113616782134a7a2d3a5b9b9e2
use correct class loader when looking up services

diff -r 202e54a09a72 -r c958f16fd52f graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Services.java
--- a/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Services.java	Fri Aug 08 23:58:15 2014 +0200
+++ b/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Services.java	Fri Aug 08 23:58:53 2014 +0200
@@ -56,7 +56,7 @@
                 // Fall back to standard SerivceLoader
             }
         }
-        return ServiceLoader.loadInstalled(service);
+        return ServiceLoader.load(service, Services.class.getClassLoader());
     }
 
     private static native <S> S[] getServiceImpls(Class<?> service);
diff -r 202e54a09a72 -r c958f16fd52f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java	Fri Aug 08 23:58:15 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java	Fri Aug 08 23:58:53 2014 +0200
@@ -24,6 +24,7 @@
 
 import java.util.*;
 
+import com.oracle.graal.api.runtime.*;
 import com.oracle.graal.options.*;
 
 /**
@@ -36,8 +37,7 @@
      * Initializes {@link #options} from {@link Options} services.
      */
     static {
-        ServiceLoader<Options> sl = ServiceLoader.load(Options.class);
-        for (Options opts : sl) {
+        for (Options opts : Services.load(Options.class)) {
             for (OptionDescriptor desc : opts) {
                 if (isHotSpotOption(desc)) {
                     String name = desc.getName();
diff -r 202e54a09a72 -r c958f16fd52f graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java
--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Fri Aug 08 23:58:15 2014 +0200
+++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Fri Aug 08 23:58:53 2014 +0200
@@ -39,7 +39,7 @@
  * retrieved as follows:
  *
  * <pre>
- * ServiceLoader&lt;Options&gt; sl = ServiceLoader.loadInstalled(Options.class);
+ * ServiceLoader&lt;Options&gt; sl = ServiceLoader.load(Options.class);
  * for (Options opts : sl) {
  *     for (OptionDescriptor desc : sl) {
  *         // use desc