[Nhibernate-commit] nhibernate/src/NHibernate/Type ManyToOneType.cs,1.10,1.11

[Paul H. <pha...@us...>]

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

Modified Files:
	ManyToOneType.cs 
Log Message:
Changed as per 2.1 implementation

Index: ManyToOneType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/ManyToOneType.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ManyToOneType.cs	1 Mar 2005 16:24:50 -0000	1.10
--- ManyToOneType.cs	8 Mar 2005 16:48:16 -0000	1.11
***************
*** 48,52 ****
  		public override void NullSafeSet( IDbCommand cmd, object value, int index, ISessionImplementor session )
  		{
! 			session.Factory.GetIdentifierType( AssociatedClass )
  				.NullSafeSet( cmd, GetIdentifier( value, session ), index, session );
  		}
--- 48,52 ----
  		public override void NullSafeSet( IDbCommand cmd, object value, int index, ISessionImplementor session )
  		{
! 			GetIdentifierOrUniqueKeyType( session.Factory )
  				.NullSafeSet( cmd, GetIdentifier( value, session ), index, session );
  		}
***************
*** 82,87 ****
  		public override object Hydrate( IDataReader rs, string[ ] names, ISessionImplementor session, object owner )
  		{
! 			return session.Factory.GetIdentifierType( AssociatedClass )
  				.NullSafeGet( rs, names, session, owner );
  		}
  
--- 82,93 ----
  		public override object Hydrate( IDataReader rs, string[ ] names, ISessionImplementor session, object owner )
  		{
! 			object id = GetIdentifierOrUniqueKeyType( session.Factory )
  				.NullSafeGet( rs, names, session, owner );
+ 
+ 			if ( id != null )
+ 			{
+ 				session.ScheduleBatchLoad( AssociatedClass, id );
+ 			}
+ 			return id;
  		}