# HG changeset patch
# User lancea
# Date 1302189909 14400
# Node ID d7a77bce0742e4070dc8cb0f9252cf727cba3472
# Parent  ef138d47df580861794c2c10c128183b02482cd2
7034656: Address lint warnings for DriverManager
Reviewed-by: alanb, forax, ohair

diff -r ef138d47df58 -r d7a77bce0742 jdk/src/share/classes/java/sql/DriverManager.java
--- a/jdk/src/share/classes/java/sql/DriverManager.java	Thu Apr 07 15:06:32 2011 +0100
+++ b/jdk/src/share/classes/java/sql/DriverManager.java	Thu Apr 07 11:25:09 2011 -0400
@@ -483,8 +483,8 @@
     private static void loadInitialDrivers() {
         String drivers;
         try {
-            drivers = (String)  AccessController.doPrivileged(new PrivilegedAction() {
-                public Object run() {
+            drivers = AccessController.doPrivileged(new PrivilegedAction<String>() {
+                public String run() {
                     return System.getProperty("jdbc.drivers");
                 }
             });
@@ -496,8 +496,8 @@
         // exposed as a java.sql.Driver.class service.
         // ServiceLoader.load() replaces the sun.misc.Providers()
 
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            public Void run() {
 
                 ServiceLoader<Driver> loadedDrivers = ServiceLoader.load(Driver.class);
                 Iterator driversIterator = loadedDrivers.iterator();