archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8193256: Configuration and ModuleLayer findModule cleanup

Browse source 
Reviewed-by: redestad, alanb
This commit is contained in:
Andrej Golovnin 2017-12-08 14:28:51 +00:00 • committed by Alan Bateman
parent a87551990a
commit 93aa3ae4d7
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/java.base/share/classes/java/lang/ModuleLayer.java
View file

@ -845,9 +845,8 @@ public final class ModuleLayer {
return layers()
.skip(1) // skip this layer
.map(l -> l.nameToModule)
.filter(map -> map.containsKey(name))
.map(map -> map.get(name))
.map(l -> l.nameToModule.get(name))
.filter(Objects::nonNull)
.findAny();
}

5
src/java.base/share/classes/java/lang/module/Configuration.java
View file

@ -543,9 +543,8 @@ public final class Configuration {
if (!parents.isEmpty()) {
return configurations()
.skip(1) // skip this configuration
.map(cf -> cf.nameToModule)
.filter(map -> map.containsKey(name))
.map(map -> map.get(name))
.map(cf -> cf.nameToModule.get(name))
.filter(Objects::nonNull)
.findFirst();
}