< prev index next >

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java

Print this page

        

@@ -27,10 +27,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UncheckedIOException;
 import java.lang.module.Configuration;
+import java.lang.module.FindException;
 import java.lang.module.ModuleDescriptor;
 import java.lang.module.ModuleFinder;
 import java.lang.module.ModuleReference;
 import java.lang.module.ResolutionException;
 import java.lang.module.ResolvedModule;

@@ -230,11 +231,11 @@
                 Files.write(Paths.get(options.saveoptsfile), getSaveOpts().getBytes());
             }
 
             return EXIT_OK;
         } catch (PluginException | IllegalArgumentException |
-                 UncheckedIOException |IOException | ResolutionException e) {
+                 UncheckedIOException |IOException | FindException | ResolutionException e) {
             log.println(taskHelper.getMessage("error.prefix") + " " + e.getMessage());
             if (DEBUG) {
                 e.printStackTrace(log);
             }
             return EXIT_ERROR;

@@ -416,11 +417,11 @@
         if (roots.isEmpty()) {
             throw new IllegalArgumentException("empty modules and limitmods");
         }
 
         Configuration cf = Configuration.empty()
-                .resolveRequires(finder,
+                .resolve(finder,
                                  ModuleFinder.of(),
                                  roots);
 
         // emit warning for modules that end with a digit
         cf.modules().stream()

@@ -456,11 +457,11 @@
                                             Set<String> roots,
                                             Set<String> otherMods) {
 
         // resolve all root modules
         Configuration cf = Configuration.empty()
-                .resolveRequires(finder,
+                .resolve(finder,
                                  ModuleFinder.of(),
                                  roots);
 
         // module name -> reference
         Map<String, ModuleReference> map = new HashMap<>();
< prev index next >