hibernate-commits

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

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

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

Index: DatasourceConnectionProvider.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/connection/DatasourceConnectionProvider.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DatasourceConnectionProvider.java	27 Oct 2002 03:11:33 -0000	1.12
--- DatasourceConnectionProvider.java	16 Apr 2003 15:06:55 -0000	1.13
***************
*** 28,33 ****
      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);
--- 28,33 ----
      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);
***************
*** 39,49 ****
  		
          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 );
      }
  
--- 39,50 ----
  		
          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 );
      }