jdk-sandbox: comparison jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java

equal deleted inserted replaced

-:e3707dde9509
+:399112af8803
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
+import java.util.ServiceLoader;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import javax.sound.sampled.AudioPermission;
-import sun.misc.Service;
 /** Managing security in the Java Sound implementation.
 * This class contains all code that uses and is used by
 * SecurityManager.doPrivileged().
 *
 static void loadLibrary(final String libName) {
 try {
 if (hasSecurityManager()) {
 if(Printer.debug) Printer.debug("using security manager to load library");
-PrivilegedAction action = new PrivilegedAction() {
+PrivilegedAction<Void> action = new PrivilegedAction<Void>() {
-public Object run() {
+public Void run() {
 System.loadLibrary(libName);
 return null;
 }
 };
 AccessController.doPrivileged(action);
 static String getProperty(final String propertyName) {
 String propertyValue;
 if (hasSecurityManager()) {
 if(Printer.debug) Printer.debug("using JDK 1.2 security to get property");
 try{
-PrivilegedAction action = new PrivilegedAction() {
+PrivilegedAction<String> action = new PrivilegedAction<String>() {
-public Object run() {
+public String run() {
 try {
 return System.getProperty(propertyName);
 } catch (Throwable t) {
 return null;
 }
 }
 };
-propertyValue = (String) AccessController.doPrivileged(action);
+propertyValue = AccessController.doPrivileged(action);
 } catch( Exception e ) {
 if(Printer.debug) Printer.debug("not using JDK 1.2 security to get properties");
 propertyValue = System.getProperty(propertyName);
 }
 } else {
 static void loadProperties(final Properties properties,
 final String filename) {
 if(hasSecurityManager()) {
 try {
 // invoke the privileged action using 1.2 security
-PrivilegedAction action = new PrivilegedAction() {
+PrivilegedAction<Void> action = new PrivilegedAction<Void>() {
-public Object run() {
+public Void run() {
 loadPropertiesImpl(properties, filename);
 return null;
 }
 };
 AccessController.doPrivileged(action);
 private static ThreadGroup getTopmostThreadGroup() {
 ThreadGroup topmostThreadGroup;
 if(hasSecurityManager()) {
 try {
 // invoke the privileged action using 1.2 security
-PrivilegedAction action = new PrivilegedAction() {
+PrivilegedAction<ThreadGroup> action = new PrivilegedAction<ThreadGroup>() {
-public Object run() {
+public ThreadGroup run() {
 try {
 return getTopmostThreadGroupImpl();
 } catch (Throwable t) {
 return null;
 }
 }
 };
-topmostThreadGroup = (ThreadGroup) AccessController.doPrivileged(action);
+topmostThreadGroup = AccessController.doPrivileged(action);
 if(Printer.debug)Printer.debug("Got topmost thread group with JDK 1.2 security");
 } catch (Exception e) {
 if(Printer.debug)Printer.debug("Exception getting topmost thread group with JDK 1.2 security");
 // try without using JDK 1.2 security
 topmostThreadGroup = getTopmostThreadGroupImpl();
 final String threadName,
 final boolean isDaemon, final int priority,
 final boolean doStart) {
 Thread thread = null;
 if(hasSecurityManager()) {
-PrivilegedAction action = new PrivilegedAction() {
+PrivilegedAction<Thread> action = new PrivilegedAction<Thread>() {
-public Object run() {
+public Thread run() {
 try {
 return createThreadImpl(runnable, threadName,
 isDaemon, priority,
 doStart);
 } catch (Throwable t) {
 return null;
 }
 }
 };
-thread = (Thread) AccessController.doPrivileged(action);
+thread = AccessController.doPrivileged(action);
 if(Printer.debug) Printer.debug("created thread with JDK 1.2 security");
 } else {
 if(Printer.debug)Printer.debug("not using JDK 1.2 security");
 thread = createThreadImpl(runnable, threadName, isDaemon, priority,
 doStart);
 }
 return thread;
 }
-static List getProviders(final Class providerClass) {
+static <T> List<T> getProviders(final Class<T> providerClass) {
-List p = new ArrayList();
+List<T> p = new ArrayList<>();
-// Service.providers(Class) just creates "lazy" iterator instance,
+// ServiceLoader creates "lazy" iterator instance, so it doesn't,
-// so it doesn't require do be called from privileged section
+// require do be called from privileged section
-final Iterator ps = Service.providers(providerClass);
+final Iterator<T> ps = ServiceLoader.load(providerClass).iterator();
 // the iterator's hasNext() method looks through classpath for
 // the provider class names, so it requires read permissions
 PrivilegedAction<Boolean> hasNextAction = new PrivilegedAction<Boolean>() {
 public Boolean run() {
 while (AccessController.doPrivileged(hasNextAction)) {
 try {
 // the iterator's next() method creates instances of the
 // providers and it should be called in the current security
 // context
-Object provider = ps.next();
+T provider = ps.next();
 if (providerClass.isInstance(provider)) {
 // $$mp 2003-08-22
 // Always adding at the beginning reverses the
 // order of the providers. So we no longer have
 // to do this in AudioSystem and MidiSystem.

changeset 11123	399112af8803
parent 5506	202f599c92aa
child 18215	b2afd66ce6db