[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql SQLDriverManager.java, 1.6, 1.7

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20971/fw/src/net/sourceforge/squirrel_sql/fw/sql

Modified Files:
	SQLDriverManager.java 
Log Message:
1448738:  JDK 6.0 regression.  Used the (correct) method for getting a 
class from the ClassLoader, according to the response to the bug report
I submitted against Java SE 6.  Details are here:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6446627

Index: SQLDriverManager.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLDriverManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SQLDriverManager.java	25 Sep 2005 02:56:14 -0000	1.6
--- SQLDriverManager.java	11 Sep 2006 00:36:16 -0000	1.7
***************
*** 71,75 ****
  		sqlDriver.addPropertyChangeListener(_myDriverListener);
  		ClassLoader loader = new SQLDriverClassLoader(sqlDriver);
! 		Class driverClass = loader.loadClass(sqlDriver.getDriverClassName());
  		_driverInfo.put(sqlDriver.getIdentifier(), driverClass.newInstance());
  		_classLoaders.put(sqlDriver.getIdentifier(), loader);
--- 71,76 ----
  		sqlDriver.addPropertyChangeListener(_myDriverListener);
  		ClassLoader loader = new SQLDriverClassLoader(sqlDriver);
! 		Class driverClass = 
! 			Class.forName(sqlDriver.getDriverClassName(), false, loader);
  		_driverInfo.put(sqlDriver.getIdentifier(), driverClass.newInstance());
  		_classLoaders.put(sqlDriver.getIdentifier(), loader);
***************
*** 120,124 ****
  							sqlDriver.getDriverClassName());
  			ClassLoader loader = new SQLDriverClassLoader(sqlDriver);
! 			Class driverCls = loader.loadClass(sqlDriver.getDriverClassName());
  			driver = (Driver)driverCls.newInstance();
  		}
--- 121,126 ----
  							sqlDriver.getDriverClassName());
  			ClassLoader loader = new SQLDriverClassLoader(sqlDriver);
! 			Class driverCls = 
! 				Class.forName(sqlDriver.getDriverClassName(), false, loader);
  			driver = (Driver)driverCls.newInstance();
  		}