NH-3453 - Proposed fix

Author: JKeyser

src/NHibernate/Type/EntityType.cs

@@ -161,14 +161,24 @@ protected internal object GetIdentifier(object value, ISessionImplementor sessio
 				return value;
 			}
 
-			if (IsReferenceToPrimaryKey)
+			return ForeignKeys.GetEntityIdentifierIfNotUnsaved(GetAssociatedEntityName(), value, session); //tolerates nulls
+		}
+
+		protected internal object GetReferenceValue(object value, ISessionImplementor session)
+		{
+			if (IsNotEmbedded(session))
 			{
-				return ForeignKeys.GetEntityIdentifierIfNotUnsaved(GetAssociatedEntityName(), value, session); //tolerates nulls
+				return value;
 			}
-			else if (value == null)
+
+			if (value == null)
 			{
 				return null;
 			}
+			else if (IsReferenceToPrimaryKey)
+			{
+				return ForeignKeys.GetEntityIdentifierIfNotUnsaved(GetAssociatedEntityName(), value, session); //tolerates nulls
+			}
 			else
 			{
 				IEntityPersister entityPersister = session.Factory.GetEntityPersister(GetAssociatedEntityName());
@@ -180,7 +190,7 @@ protected internal object GetIdentifier(object value, ISessionImplementor sessio
 				IType type = entityPersister.GetPropertyType(uniqueKeyPropertyName);
 				if (type.IsEntityType)
 				{
-					propertyValue = ((EntityType)type).GetIdentifier(propertyValue, session);
+					propertyValue = ((EntityType)type).GetReferenceValue(propertyValue, session);
 				}
 
 				return propertyValue;
@@ -279,7 +289,7 @@ public override object Replace(object original, object target, ISessionImplement
 				}
 				else
 				{
-					object id = GetIdentifier(original, session);
+					object id = GetReferenceValue(original, session);
 					if (id == null)
 					{
 						throw new AssertionFailure("non-transient entity has a null id");

src/NHibernate/Type/ManyToOneType.cs

@@ -46,13 +46,13 @@ public override SqlType[] SqlTypes(IMapping mapping)
 		public override void NullSafeSet(IDbCommand st, object value, int index, bool[] settable, ISessionImplementor session)
 		{
 			GetIdentifierOrUniqueKeyType(session.Factory)
-				.NullSafeSet(st, GetIdentifier(value, session), index, settable, session);
+				.NullSafeSet(st, GetReferenceValue(value, session), index, settable, session);
 		}
 
 		public override void NullSafeSet(IDbCommand cmd, object value, int index, ISessionImplementor session)
 		{
 			GetIdentifierOrUniqueKeyType(session.Factory)
-				.NullSafeSet(cmd, GetIdentifier(value, session), index, session);
+				.NullSafeSet(cmd, GetReferenceValue(value, session), index, session);
 		}
 
 		public override bool IsOneToOne