# HG changeset patch
# User mullan
# Date 1346362930 25200
# Node ID 2c0ad4f2168cc386360815474656c64f2d2dddc7
# Parent  7c894680910a3616444b770fbdbd7e78f9a6f108# Parent  bf59eb142ae2c76d8e0e94fac4a15b0fdcc2e2bf
Merge

diff -r 7c894680910a -r 2c0ad4f2168c jdk/src/share/classes/java/sql/DriverManager.java
--- a/jdk/src/share/classes/java/sql/DriverManager.java	Thu Aug 30 14:40:57 2012 -0700
+++ b/jdk/src/share/classes/java/sql/DriverManager.java	Thu Aug 30 14:42:10 2012 -0700
@@ -510,7 +510,7 @@
             public Void run() {
 
                 ServiceLoader<Driver> loadedDrivers = ServiceLoader.load(Driver.class);
-                Iterator driversIterator = loadedDrivers.iterator();
+                Iterator<Driver> driversIterator = loadedDrivers.iterator();
 
                 /* Load these drivers, so that they can be instantiated.
                  * It may be the case that the driver class may not be there