stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8172461: Service Registration Lifecycle

Browse Source 
Reviewed-by: serb, vadim, skoivu, shurailine
This commit is contained in:
Phil Race 2017-02-06 15:31:37 -08:00
parent 1820a4cd5b
commit daee16a014
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jdk/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
View File

@ -26,6 +26,9 @@
package javax.imageio.spi; package javax.imageio.spi;
import java.io.File; import java.io.File;
import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@ -755,13 +758,14 @@ class SubRegistry {
Class<?> category; Class<?> category;
// Provider Objects organized by partial oridering // Provider Objects organized by partial ordering
PartiallyOrderedSet<Object> poset = new PartiallyOrderedSet<>(); final PartiallyOrderedSet<Object> poset = new PartiallyOrderedSet<>();
// Class -> Provider Object of that class // Class -> Provider Object of that class
// No way to express heterogeneous map, we want // No way to express heterogeneous map, we want
// Map<Class<T>, T>, where T is ? // Map<Class<T>, T>, where T is ?
Map<Class<?>, Object> map = new HashMap<>(); final Map<Class<?>, Object> map = new HashMap<>();
final Map<Class<?>, AccessControlContext> accMap = new HashMap<>();
public SubRegistry(ServiceRegistry registry, Class<?> category) { public SubRegistry(ServiceRegistry registry, Class<?> category) {
this.registry = registry; this.registry = registry;
@ -776,6 +780,7 @@ class SubRegistry {
deregisterServiceProvider(oprovider); deregisterServiceProvider(oprovider);
} }
map.put(provider.getClass(), provider); map.put(provider.getClass(), provider);
accMap.put(provider.getClass(), AccessController.getContext());
poset.add(provider); poset.add(provider);
if (provider instanceof RegisterableService) { if (provider instanceof RegisterableService) {
RegisterableService rs = (RegisterableService)provider; RegisterableService rs = (RegisterableService)provider;
@ -800,6 +805,7 @@ class SubRegistry {
if (provider == oprovider) { if (provider == oprovider) {
map.remove(provider.getClass()); map.remove(provider.getClass());
accMap.remove(provider.getClass());
poset.remove(provider); poset.remove(provider);
if (provider instanceof RegisterableService) { if (provider instanceof RegisterableService) {
RegisterableService rs = (RegisterableService)provider; RegisterableService rs = (RegisterableService)provider;
@ -849,10 +855,17 @@ class SubRegistry {
if (provider instanceof RegisterableService) { if (provider instanceof RegisterableService) {
RegisterableService rs = (RegisterableService)provider; RegisterableService rs = (RegisterableService)provider;
AccessControlContext acc = accMap.get(provider.getClass());
if (acc != null || System.getSecurityManager() == null) {
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
rs.onDeregistration(registry, category); rs.onDeregistration(registry, category);
return null;
}, acc);
}
} }
} }
poset.clear(); poset.clear();
accMap.clear();
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")