Mercurial > hg > openjdk > jdk7 > jdk

changeset 3985:5137806a3e34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7034656: Address lint warnings for DriverManager Reviewed-by: alanb, forax, ohair
author lancea
date Thu, 07 Apr 2011 11:25:09 -0400
parents 31619dfa6a4a
children d8dfd1a0bd8d
files src/share/classes/java/sql/DriverManager.java
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/sql/DriverManager.java	Thu Apr 07 15:06:32 2011 +0100
+++ b/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();