changeset 13662:2c0ad4f2168c

Merge
author mullan
date Thu, 30 Aug 2012 14:42:10 -0700
parents 7c894680910a bf59eb142ae2
children 1b3474c77d33
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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