[Hibernate-commits] Hibernate2/src/net/sf/hibernate/loader Loader.java,1.17,1.18

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

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

Modified Files:
	Loader.java 
Log Message:
* SessionFactory.close() now unbinds from JNDI
* added Session.remove()
* got rid of another unnecessry collection delete()

Index: Loader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/Loader.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Loader.java	8 Apr 2003 09:49:30 -0000	1.17
--- Loader.java	19 Apr 2003 03:26:08 -0000	1.18
***************
*** 126,130 ****
  			final boolean[] hydrate = new boolean[cols]; //we can reuse it each time
  			
! 			for ( int count=0; count<maxRows && rs.next(); count++ ) {
  				
  				for ( int i=0; i<cols; i++ ) {
--- 126,133 ----
  			final boolean[] hydrate = new boolean[cols]; //we can reuse it each time
  			
! 			if ( log.isTraceEnabled() ) log.trace("processing result set");
! 			
! 			int count;
! 			for ( count=0; count<maxRows && rs.next(); count++ ) {
  				
  				for ( int i=0; i<cols; i++ ) {
***************
*** 156,160 ****
  				}
  				
- 				
  				results.add( getResultColumnOrRow(row, rs, session) );
  				
--- 159,162 ----
***************
*** 162,165 ****
--- 164,169 ----
  			}
  			
+ 			if ( log.isTraceEnabled() ) log.trace("done processing result set (" + count + " rows)");
+ 			
  		}
  		catch (SQLException sqle) {
***************
*** 374,378 ****
  	 * Obtain a <tt>PreparedStatement</tt> and bind JDBC-style <tt>?</tt> and named parameters
  	 */
! 	protected final PreparedStatement prepareQueryStatement(String sql, Object[] values, Type[] types, Map namedParams, RowSelection selection, boolean scroll, SessionImplementor session) throws SQLException, HibernateException {
  		
  		boolean scrollable = selection!=null &&
--- 378,391 ----
  	 * Obtain a <tt>PreparedStatement</tt> and bind JDBC-style <tt>?</tt> and named parameters
  	 */
! 	protected final PreparedStatement prepareQueryStatement(
! 		String sql, 
! 		Object[] 
! 		values, 
! 		Type[] types, 
! 		Map namedParams, 
! 		RowSelection selection, 
! 		boolean scroll, 
! 		SessionImplementor session
! 	) throws SQLException, HibernateException {
  		
  		boolean scrollable = selection!=null &&