From ccf3731fe2d87b1ae59120b287e0b9e659556b48 Mon Sep 17 00:00:00 2001
From: sherman <unknown>
Date: Fri, 14 Mar 2008 14:21:03 -0700
Subject: [PATCH] 6514993: (prefs)prefs should use java.util.ServiceLoader to
 lookup service providers Reviewed-by: iris Contributed-by:
 xueming.shen@sun.com

---
 .../classes/java/util/prefs/Preferences.java      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/share/classes/java/util/prefs/Preferences.java b/src/share/classes/java/util/prefs/Preferences.java
index 1c25cfdbc..1aad5d9f0 100644
--- a/src/share/classes/java/util/prefs/Preferences.java
+++ b/src/share/classes/java/util/prefs/Preferences.java
@@ -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
-- 
GitLab