Mercurial > hg > graal-compiler

diff graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java @ 23222:56359eb3abfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved @ServiceProvider mechanism from JVMCI to Graal (GRAAL-1380)
author Doug Simon <doug.simon@oracle.com>
date Wed, 30 Dec 2015 18:08:59 +0100
parents 615f3bbbb174
children
line wrap: on
line diff
--- a/graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java	Tue Dec 29 13:23:02 2015 +0100
+++ b/graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java	Wed Dec 30 18:08:59 2015 +0100
@@ -49,13 +49,17 @@
         NativeFunctionInterfaceAccess access = null;
         Class<?> servicesClass = null;
         try {
-            servicesClass = Class.forName("jdk.vm.ci.service.Services");
+            servicesClass = Class.forName("jdk.vm.ci.services.Services");
         } catch (ClassNotFoundException e) {
             try {
-                // Legacy support
-                servicesClass = Class.forName("com.oracle.jvmci.service.Services");
+                servicesClass = Class.forName("jdk.vm.ci.service.Services");
             } catch (ClassNotFoundException e2) {
-                // JVMCI is unavailable
+                try {
+                    // Legacy support
+                    servicesClass = Class.forName("com.oracle.jvmci.service.Services");
+                } catch (ClassNotFoundException e3) {
+                    // JVMCI is unavailable
+                }
             }
         }
         if (servicesClass != null) {