[Nhibernate-commit] nhibernate/src/NHibernate/Type EntityType.cs,1.9,1.10

[Sergey K. <jus...@us...>]

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

Modified Files:
	EntityType.cs 
Log Message:
Ported property-ref attribute implementation from Hibernate 2.1

Index: EntityType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/EntityType.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EntityType.cs	1 Mar 2005 16:24:50 -0000	1.9
--- EntityType.cs	26 Mar 2005 13:24:37 -0000	1.10
***************
*** 88,92 ****
  		protected object GetIdentifier( object value, ISessionImplementor session )
  		{
! 			return session.GetEntityIdentifierIfNotUnsaved( value );
  		}
  
--- 88,105 ----
  		protected object GetIdentifier( object value, ISessionImplementor session )
  		{
! 			if( uniqueKeyPropertyName==null )
! 			{
! 				return session.GetEntityIdentifierIfNotUnsaved( value ); //tolerates nulls
! 			}
! 			else if( value == null ) 
! 			{
! 				return null;
! 			}
! 			else 
! 			{
! 				return session.Factory
! 					.GetPersister( AssociatedClass )
! 					.GetPropertyValue( value, uniqueKeyPropertyName );
! 			}
  		}
  
***************
*** 224,230 ****
  				else
  				{
! 					// TODO: Extend ISessionImplentor interface
! 					//return session.LoadByUniqueKey( AssociatedClass, uniqueKeyPropertyName, id );
! 					throw new NotImplementedException( "session.LoadByUniqueKey not implemented" );
  				}
  			}
--- 237,241 ----
  				else
  				{
! 					return session.LoadByUniqueKey( AssociatedClass, uniqueKeyPropertyName, id );
  				}
  			}