[Hibernate-commits] Hibernate/cirrus/hibernate/connection C3P0ConnectionProvider.java,1.18,1.19 ConnectionProviderFactory.java,1.11,1.12 DBCPConnectionProvider.java,1.6,1.7 DriverManagerConnectionProvider.java,1.18,1.19

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/connection
In directory sc8-pr-cvs1:/tmp/cvs-serv29686/hibernate/connection

Modified Files:
	C3P0ConnectionProvider.java ConnectionProviderFactory.java 
	DBCPConnectionProvider.java 
	DriverManagerConnectionProvider.java 
Log Message:
fixed an NPE when username was not specied
fixed a bug in TimestampType

Index: C3P0ConnectionProvider.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/connection/C3P0ConnectionProvider.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** C3P0ConnectionProvider.java	27 Dec 2002 11:54:48 -0000	1.18
--- C3P0ConnectionProvider.java	15 Jan 2003 10:28:39 -0000	1.19
***************
*** 60,64 ****
      	String jdbcDriverClass = props.getProperty(Environment.DRIVER);
      	String jdbcUrl = props.getProperty(Environment.URL);
!     	Properties connectionProps = ConnectionProviderFactory.getJdbcConnectionProperties(props);
      	
      	log.info("C3P0 using driver: " + jdbcDriverClass + " at URL: " + jdbcUrl);
--- 60,64 ----
      	String jdbcDriverClass = props.getProperty(Environment.DRIVER);
      	String jdbcUrl = props.getProperty(Environment.URL);
!     	Properties connectionProps = ConnectionProviderFactory.getConnectionProperties(props);
      	
      	log.info("C3P0 using driver: " + jdbcDriverClass + " at URL: " + jdbcUrl);

Index: ConnectionProviderFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/connection/ConnectionProviderFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ConnectionProviderFactory.java	1 Jan 2003 03:03:16 -0000	1.11
--- ConnectionProviderFactory.java	15 Jan 2003 10:28:39 -0000	1.12
***************
*** 83,87 ****
  	 * format accepted by <tt>DriverManager</tt> by triming the leading "<tt>hibernate.connection</tt>".
  	 */
! 	public static Properties getJdbcConnectionProperties(Properties properties) {
  		
  		HashSet specialProps = new HashSet();
--- 83,87 ----
  	 * format accepted by <tt>DriverManager</tt> by triming the leading "<tt>hibernate.connection</tt>".
  	 */
! 	public static Properties getConnectionProperties(Properties properties) {
  		
  		HashSet specialProps = new HashSet();
***************
*** 105,109 ****
  			}
  		}
! 		result.setProperty( "user", properties.getProperty(Environment.USER) );
  		return result;
  	}
--- 105,110 ----
  			}
  		}
! 		String userName = properties.getProperty(Environment.USER);
! 		if (userName!=null) result.setProperty( "user", userName );
  		return result;
  	}

Index: DBCPConnectionProvider.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/connection/DBCPConnectionProvider.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DBCPConnectionProvider.java	27 Dec 2002 11:54:48 -0000	1.6
--- DBCPConnectionProvider.java	15 Jan 2003 10:28:39 -0000	1.7
***************
*** 65,69 ****
      	String jdbcDriverClass = props.getProperty(Environment.DRIVER);
      	String jdbcUrl = props.getProperty(Environment.URL);
!     	Properties connectionProps = ConnectionProviderFactory.getJdbcConnectionProperties(props);
      	
      	log.info("DBCP using driver: " + jdbcDriverClass + " at URL: " + jdbcUrl);
--- 65,69 ----
      	String jdbcDriverClass = props.getProperty(Environment.DRIVER);
      	String jdbcUrl = props.getProperty(Environment.URL);
!     	Properties connectionProps = ConnectionProviderFactory.getConnectionProperties(props);
      	
      	log.info("DBCP using driver: " + jdbcDriverClass + " at URL: " + jdbcUrl);

Index: DriverManagerConnectionProvider.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/connection/DriverManagerConnectionProvider.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DriverManagerConnectionProvider.java	23 Nov 2002 00:24:17 -0000	1.18
--- DriverManagerConnectionProvider.java	15 Jan 2003 10:28:39 -0000	1.19
***************
*** 61,65 ****
      	}
      	
! 		connectionProps = ConnectionProviderFactory.getJdbcConnectionProperties(props);
  				
  		log.info( "Using driver: " + driverClass + " at URL: " + url );
--- 61,65 ----
      	}
      	
! 		connectionProps = ConnectionProviderFactory.getConnectionProperties(props);
  				
  		log.info( "Using driver: " + driverClass + " at URL: " + url );