# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1434783602 -7200
# Node ID 3e7ab72bac9640897872e3061e260770edac2a80
# Parent  434fbaaf53d7786be61ff663ae6425471f120217
fix for renaming packages com.oracle.jvmci to jdk.internal.jvmci

diff -r 434fbaaf53d7 -r 3e7ab72bac96 graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java
--- 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 {