[Nhibernate-commit] nhibernate/src/NHibernate/Loader Loader.cs,1.22,1.23

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2928/NHibernate/Loader

Modified Files:
	Loader.cs 
Log Message:
Modified some code formatting for easier debugging and added some details
to comments.

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Loader.cs	20 May 2004 21:05:30 -0000	1.22
--- Loader.cs	23 Jun 2004 21:15:56 -0000	1.23
***************
*** 221,225 ****
  							PersistentCollection rowCollection = session.GetLoadingCollection(collectionPersister, ownerKey.Identifier, row[collectionOwner]);
  							object collectionRowKey = collectionPersister.ReadKey(rs, session);
! 							if(collectionRowKey!=null) rowCollection.ReadFrom(rs, CollectionPersister, row[collectionOwner]);						   
  						}
  					}
--- 221,228 ----
  							PersistentCollection rowCollection = session.GetLoadingCollection(collectionPersister, ownerKey.Identifier, row[collectionOwner]);
  							object collectionRowKey = collectionPersister.ReadKey(rs, session);
! 							if(collectionRowKey!=null) 
! 							{
! 								rowCollection.ReadFrom(rs, CollectionPersister, row[collectionOwner]);						   
! 							}
  						}
  					}
***************
*** 687,691 ****
  				log.Info(st.CommandText);
  				//TODO: H2.0.3 - uses session.Batcher.GetResultSet(st) instead
! 				// of directly executing the reader
  				IDataReader rs = st.ExecuteReader();
  				
--- 690,695 ----
  				log.Info(st.CommandText);
  				//TODO: H2.0.3 - uses session.Batcher.GetResultSet(st) instead
! 				// of directly executing the reader - the Batcher can be smarter 
! 				// about when to wrap the IDataReader in an NDataReader
  				IDataReader rs = st.ExecuteReader();