langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
equal
deleted
inserted
replaced
966 Module.getModule(getClass()).addUses(service); |
966 Module.getModule(getClass()).addUses(service); |
967 if (location.isModuleOrientedLocation()) { |
967 if (location.isModuleOrientedLocation()) { |
968 Collection<Path> paths = locations.getLocation(location); |
968 Collection<Path> paths = locations.getLocation(location); |
969 ModuleFinder finder = ModuleFinder.of(paths.toArray(new Path[paths.size()])); |
969 ModuleFinder finder = ModuleFinder.of(paths.toArray(new Path[paths.size()])); |
970 Layer bootLayer = Layer.boot(); |
970 Layer bootLayer = Layer.boot(); |
971 Configuration cf = bootLayer.configuration().resolveRequiresAndUses(ModuleFinder.of(), finder, Collections.emptySet()); |
971 Configuration cf = bootLayer.configuration().resolveAndBind(ModuleFinder.of(), finder, Collections.emptySet()); |
972 Layer layer = bootLayer.defineModulesWithOneLoader(cf, ClassLoader.getSystemClassLoader()); |
972 Layer layer = bootLayer.defineModulesWithOneLoader(cf, ClassLoader.getSystemClassLoader()); |
973 return ServiceLoaderHelper.load(layer, service); |
973 return ServiceLoaderHelper.load(layer, service); |
974 } else { |
974 } else { |
975 return ServiceLoader.load(service, getClassLoader(location)); |
975 return ServiceLoader.load(service, getClassLoader(location)); |
976 } |
976 } |