[Hibernate-commits] Hibernate2/src/net/sf/hibernate/connection DatasourceConnectionProvider.java,1.6,1.7

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/connection
In directory sc8-pr-cvs1:/tmp/cvs-serv18620/hibernate/connection

Modified Files:
	DatasourceConnectionProvider.java 
Log Message:
throw an exception instead of npe

Index: DatasourceConnectionProvider.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/connection/DatasourceConnectionProvider.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DatasourceConnectionProvider.java	21 Mar 2003 12:03:36 -0000	1.6
--- DatasourceConnectionProvider.java	16 Apr 2003 15:05:54 -0000	1.7
***************
*** 31,36 ****
  	public void configure(Properties props) throws HibernateException {
  		
! 		String jndi_name = props.getProperty(Environment.DATASOURCE);
! 		if (jndi_name==null) {
  			String msg = "datasource JNDI name was not specified by property " + Environment.DATASOURCE;
  			log.fatal(msg);
--- 31,36 ----
  	public void configure(Properties props) throws HibernateException {
  		
! 		String jndiName = props.getProperty(Environment.DATASOURCE);
! 		if (jndiName==null) {
  			String msg = "datasource JNDI name was not specified by property " + Environment.DATASOURCE;
  			log.fatal(msg);
***************
*** 42,52 ****
  		
  		try {
! 			ds = (DataSource) NamingHelper.getInitialContext(props).lookup(jndi_name);
  		}
  		catch (Exception e) {
! 			log.fatal( "Could not find datasource: " + jndi_name, e );
  			throw new HibernateException( "Could not find datasource", e );
  		}
! 		log.info( "Using datasource: " + jndi_name );
  	}
  	
--- 42,53 ----
  		
  		try {
! 			ds = (DataSource) NamingHelper.getInitialContext(props).lookup(jndiName);
  		}
  		catch (Exception e) {
! 			log.fatal( "Could not find datasource: " + jndiName, e );
  			throw new HibernateException( "Could not find datasource", e );
  		}
! 		if (ds==null) throw new HibernateException( "Could not find datasource: " + jndiName );
! 		log.info( "Using datasource: " + jndiName );
  	}