# HG changeset patch # User Andreas Woess # Date 1434747639 -7200 # Node ID d5d416ced577720b9354bfbf4092b4480af55dbb # Parent f471d04e7801e4d67a415f72ee61d2de7f1d5e61 fix jvmci package name after renaming diff -r f471d04e7801 -r d5d416ced577 truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/Truffle.java --- 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 {