[Nhibernate-commit] SF.net SVN: nhibernate:[5494] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 5494
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5494&view=rev
Author:   fabiomaulo
Date:     2011-03-21 14:11:22 +0000 (Mon, 21 Mar 2011)

Log Message:
-----------
Fix NH-2584

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Event/Default/DefaultMergeEventListener.cs
    trunk/nhibernate/src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Event/Default/DefaultMergeEventListener.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Event/Default/DefaultMergeEventListener.cs	2011-03-21 07:31:00 UTC (rev 5493)
+++ trunk/nhibernate/src/NHibernate/Event/Default/DefaultMergeEventListener.cs	2011-03-21 14:11:22 UTC (rev 5494)
@@ -124,6 +124,10 @@
 					
 					@event.Entity = entity;
 					EntityState entityState = EntityState.Undefined;
+					if (ReferenceEquals(null, @event.EntityName))
+					{
+						@event.EntityName = source.BestGuessEntityName(entity);
+					}
 
 					// Check the persistence context for an entry relating to this
 					// entity to be merged...

Modified: trunk/nhibernate/src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs	2011-03-21 07:31:00 UTC (rev 5493)
+++ trunk/nhibernate/src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs	2011-03-21 14:11:22 UTC (rev 5494)
@@ -116,5 +116,19 @@
 			}
 		}
 
+		[Test]
+		public void CanLoadAndSaveObjectInDifferentSessions()
+		{
+			Book book;
+			using (ISession s = OpenSession())
+			{
+				book = s.Get<Book>(1);
+			}
+
+			using (ISession s = OpenSession())
+			{
+				s.Merge(book);
+			}
+		}
 	}
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.