Mercurial > hg > truffle

changeset 22296:9c108011f794

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename jdk.internal.jvmci to jdk.vm.ci
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 08 Oct 2015 17:33:41 -0700
parents 7f32031a4812
children 145f995cd2fe
files truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java	Thu Oct 08 17:13:13 2015 -0400
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java	Thu Oct 08 17:33:41 2015 -0700
@@ -61,11 +61,17 @@
                 TruffleRuntimeAccess access = null;
                 Class<?> servicesClass = null;
                 try {
-                    servicesClass = Class.forName("jdk.internal.jvmci.service.Services");
+                    servicesClass = Class.forName("jdk.vm.ci.service.Services");
                 } catch (ClassNotFoundException e) {
                 }
                 if (servicesClass == null) {
                     try {
+                        servicesClass = Class.forName("jdk.internal.jvmci.service.Services");
+                    } catch (ClassNotFoundException e) {
+                    }
+                }
+                if (servicesClass == null) {
+                    try {
                         servicesClass = Class.forName("com.oracle.jvmci.service.Services");
                     } catch (ClassNotFoundException e) {
                         // JVMCI is unavailable