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

6514993: (prefs)prefs should use java.util.ServiceLoader to lookup service providers

Browse Source 
Reviewed-by: iris
This commit is contained in:
Xueming Shen 2008-03-14 14:21:03 -07:00 committed by Xueming Shen
parent eab1a9b3df
commit 8436026352
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/src/share/classes/java/util/prefs/Preferences.java
View File

@ -32,9 +32,8 @@ import java.security.AccessController;
import java.security.Permission;
import java.security.PrivilegedAction;
import java.util.Iterator;
import sun.misc.Service;
import sun.misc.ServiceConfigurationError;
import java.util.ServiceLoader;
import java.util.ServiceConfigurationError;
// These imports needed only as a workaround for a JavaDoc bug
import java.lang.RuntimePermission;
@ -274,12 +273,14 @@ public abstract class Preferences {
private static PreferencesFactory factory1() {
// 2. Try service provider interface
Iterator i = Service.providers(PreferencesFactory.class,
ClassLoader.getSystemClassLoader());
Iterator<PreferencesFactory> itr = ServiceLoader
.load(PreferencesFactory.class, ClassLoader.getSystemClassLoader())
.iterator();
// choose first provider instance
while (i.hasNext()) {
while (itr.hasNext()) {
try {
return (PreferencesFactory) i.next();
return itr.next();
} catch (ServiceConfigurationError sce) {
if (sce.getCause() instanceof SecurityException) {
// Ignore the security exception, try the next provider