8209003: Consolidate use of empty collections in java.lang.module

Reviewed-by: alanb, mchung
This commit is contained in:
Claes Redestad 2018-08-07 23:08:52 +02:00
parent 3be8d256e9
commit db4913ba5a
14 changed files with 76 additions and 122 deletions

View file

@ -173,7 +173,7 @@ public final class ModuleLayer {
Map<String, Module> map;
if (parents.isEmpty()) {
map = Collections.emptyMap();
map = Map.of();
} else {
map = Module.defineModules(cf, clf, this);
}
@ -811,8 +811,7 @@ public final class ModuleLayer {
public Set<Module> modules() {
Set<Module> modules = this.modules;
if (modules == null) {
this.modules = modules =
Collections.unmodifiableSet(new HashSet<>(nameToModule.values()));
this.modules = modules = Set.copyOf(nameToModule.values());
}
return modules;
}