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

8292739: Invalid legacy entries may be returned by Provider.getServices() call

Browse source 
Reviewed-by: weijun
This commit is contained in:
Valerie Peng 2022-08-24 18:23:19 +00:00
parent 568be58e85
commit 14623c6087
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/java/security/Provider.java
View file

@ -1321,7 +1321,13 @@ public abstract class Provider extends Properties {
set.addAll(serviceMap.values());
}
if (!legacyMap.isEmpty()) {
set.addAll(legacyMap.values());
legacyMap.entrySet().forEach(entry -> {
if (!entry.getValue().isValid()) {
legacyMap.remove(entry.getKey(), entry.getValue());
} else {
set.add(entry.getValue());
}
});
}
serviceSet = Collections.unmodifiableSet(set);
servicesChanged = false;