Mercurial > hg > truffle

changeset 21963:d5d416ced577

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix jvmci package name after renaming
author Andreas Woess <andreas.woess@oracle.com>
date Fri, 19 Jun 2015 23:00:39 +0200
parents f471d04e7801
children 9d15f06f3537
files truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java	Fri Jun 19 12:38:02 2015 -0700
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java	Fri Jun 19 23:00:39 2015 +0200
@@ -57,11 +57,15 @@
                 TruffleRuntimeAccess 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
-                } catch (IllegalArgumentException ex) {
-                    throw new IllegalStateException("jvmci service found but yields error", ex);
+                }
+                if (servicesClass == null) {
+                    try {
+                        servicesClass = Class.forName("com.oracle.jvmci.service.Services");
+                    } catch (ClassNotFoundException e) {
+                        // JVMCI is unavailable
+                    }
                 }
                 if (servicesClass != null) {
                     try {