Mercurial > hg > truffle
changeset 16732:c958f16fd52f
use correct class loader when looking up services
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 08 Aug 2014 23:58:53 +0200 |
parents | 202e54a09a72 |
children | 7d7fae9e9d17 |
files | graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Services.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java |
diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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();
--- 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<Options> sl = ServiceLoader.loadInstalled(Options.class); + * ServiceLoader<Options> sl = ServiceLoader.load(Options.class); * for (Options opts : sl) { * for (OptionDescriptor desc : sl) { * // use desc