< prev index next >
src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
Print this page
rev 14279 : [mq]: 8140281-deprecation-optional.get
*** 240,250 ****
private static Map<String, Path> modulesToPath(Configuration cf) {
Map<String, Path> modPaths = new HashMap<>();
for (ResolvedModule resolvedModule : cf.modules()) {
ModuleReference mref = resolvedModule.reference();
! URI uri = mref.location().get();
modPaths.put(mref.descriptor().name(), Paths.get(uri));
}
return modPaths;
}
--- 240,250 ----
private static Map<String, Path> modulesToPath(Configuration cf) {
Map<String, Path> modPaths = new HashMap<>();
for (ResolvedModule resolvedModule : cf.modules()) {
ModuleReference mref = resolvedModule.reference();
! URI uri = mref.location().getWhenPresent();
modPaths.put(mref.descriptor().name(), Paths.get(uri));
}
return modPaths;
}
*** 404,414 ****
// add the other modules
for (String mod : otherMods) {
Optional<ModuleReference> omref = finder.find(mod);
if (omref.isPresent()) {
! ModuleReference mref = omref.get();
map.putIfAbsent(mod, mref);
mrefs.add(mref);
} else {
// no need to fail
}
--- 404,414 ----
// add the other modules
for (String mod : otherMods) {
Optional<ModuleReference> omref = finder.find(mod);
if (omref.isPresent()) {
! ModuleReference mref = omref.getWhenPresent();
map.putIfAbsent(mod, mref);
mrefs.add(mref);
} else {
// no need to fail
}
< prev index next >