Mercurial > hg > graal-compiler

diff graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java @ 22039:3e7ab72bac96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for renaming packages com.oracle.jvmci to jdk.internal.jvmci
author Doug Simon <doug.simon@oracle.com>
date Sat, 20 Jun 2015 09:00:02 +0200
parents 91b861398ad6
children 05183a084a08
line wrap: on
line diff
--- a/graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java	Fri Jun 19 17:41:45 2015 +0200
+++ b/graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java	Sat Jun 20 09:00:02 2015 +0200
@@ -48,9 +48,14 @@
         NativeFunctionInterfaceAccess access = null;
         Class<?> servicesClass = null;
         try {
-            servicesClass = Class.forName("com.oracle.jvmci.service.Services");
+            servicesClass = Class.forName("jdk.internal.jvmci.service.Services");
         } catch (ClassNotFoundException e) {
-            // JVMCI is unavailable
+            try {
+                // Legacy support
+                servicesClass = Class.forName("com.oracle.jvmci.service.Services");
+            } catch (ClassNotFoundException e2) {
+                // JVMCI is unavailable
+            }
         }
         if (servicesClass != null) {
             try {