Merge branch 'desunit-NH-1882' into 3.4.x

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH1882/Author.cs

@@ -0,0 +1,27 @@
+using System;
+using Iesi.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH1882
+{
+	public class Author
+	{
+		public Author()
+		{
+			Books = new HashedSet<Book>();
+		}
+
+		public Author(String name)
+		{
+			Books = new HashedSet<Book>();
+			Name = name;
+		}
+
+		public virtual int Id { get; set; }
+
+		public virtual string Name { get; set; }
+
+		public virtual Publisher Publisher { get; set; }
+
+		public virtual ISet<Book> Books { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH1882/Book.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH1882
+{
+	public class Book
+	{
+		public Book()
+		{
+		}
+
+		public Book(String title, Author author)
+		{
+			Title = title;
+			Author = author;
+		}
+
+		public virtual int Id { get; set; }
+
+		public virtual string Title { get; set; }
+
+		public virtual Author Author { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH1882/Publisher.cs

@@ -0,0 +1,25 @@
+using System;
+using Iesi.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH1882
+{
+	public class Publisher
+	{
+		public Publisher()
+		{
+			Authors = new HashedSet<Author>();
+		}
+
+		public Publisher(String name)
+		{
+			Authors = new HashedSet<Author>();
+			Name = name;
+		}
+
+		public virtual int Id { get; set; }
+
+		public virtual string Name { get; set; }
+
+		public virtual ISet<Author> Authors { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH1882/TestCollectionInitializingDuringFlush.cs

@@ -0,0 +1,119 @@
+using System;
+using NHibernate.Cfg;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Event;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1882
+{
+	[TestFixture]
+	public class TestCollectionInitializingDuringFlush : TestCaseMappingByCode
+	{
+		private readonly InitializingPreUpdateEventListener listener = new InitializingPreUpdateEventListener();
+
+		protected override void Configure(Configuration configuration)
+		{
+			configuration.EventListeners.PreUpdateEventListeners = new IPreUpdateEventListener[]
+			{
+				listener
+			};
+			base.Configure(configuration);
+		}
+
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Author>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.Identity));
+				rc.Property(x => x.Name);
+				rc.ManyToOne(x => x.Publisher, m => m.Cascade(Mapping.ByCode.Cascade.All));
+				rc.Set(x => x.Books, m =>
+				{
+					m.Cascade(Mapping.ByCode.Cascade.All);
+					m.Lazy(CollectionLazy.Lazy);
+				}, r => r.OneToMany());
+			});
+			mapper.Class<Book>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.Identity));
+				rc.Property(x => x.Title);
+				rc.ManyToOne(x => x.Author);
+			});
+			mapper.Class<Publisher>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.Identity));
+				rc.Property(x => x.Name);
+				rc.Set(x => x.Authors, m => m.Cascade(Mapping.ByCode.Cascade.All), r => r.OneToMany());
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		public class InitializingPreUpdateEventListener : IPreUpdateEventListener
+		{
+			public static InitializingPreUpdateEventListener Instance = new InitializingPreUpdateEventListener();
+
+			public bool Executed { get; set; }
+
+			public bool FoundAny { get; set; }
+
+			public bool OnPreUpdate(PreUpdateEvent @event)
+			{
+				Executed = true;
+				Object[] oldValues = @event.OldState;
+				String[] properties = @event.Persister.PropertyNames;
+
+				// Iterate through all fields of the updated object
+				for (int i = 0; i < properties.Length; i++)
+				{
+					if (oldValues != null && oldValues[i] != null)
+					{
+						if (! NHibernateUtil.IsInitialized(oldValues[i]))
+						{
+							// force any proxies and/or collections to initialize to illustrate HHH-2763
+							FoundAny = true;
+							NHibernateUtil.Initialize(oldValues[i]);
+						}
+					}
+				}
+				return true;
+			}
+		}
+
+		[Test]
+		public void TestInitializationDuringFlush()
+		{
+			Assert.False(listener.Executed);
+			Assert.False(listener.FoundAny);
+			ISession s = OpenSession();
+			s.BeginTransaction();
+			var publisher = new Publisher("acme");
+			var author = new Author("john");
+			author.Publisher = publisher;
+			publisher.Authors.Add(author);
+			author.Books.Add(new Book("Reflections on a Wimpy Kid", author));
+			s.Save(author);
+			s.Transaction.Commit();
+			s.Clear();
+
+			s = OpenSession();
+			s.BeginTransaction();
+			publisher = s.Get<Publisher>(publisher.Id);
+			publisher.Name = "random nally";
+			s.Flush();
+			s.Transaction.Commit();
+			s.Clear();
+
+			s = OpenSession();
+			s.BeginTransaction();
+			s.Delete(author);
+			s.Transaction.Commit();
+			s.Clear();
+			s.Close();
+			Assert.True(listener.Executed);
+			Assert.True(listener.FoundAny);
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -671,6 +671,10 @@
     <Compile Include="NHSpecificTest\BagWithLazyExtraAndFilter\Fixture.cs" />
     <Compile Include="Component\Basic\ComponentWithUniqueConstraintTests.cs" />
     <Compile Include="MappingByCode\ExpliticMappingTests\ClassWithoutNamespaceTests.cs" />
+    <Compile Include="NHSpecificTest\NH1882\Author.cs" />
+    <Compile Include="NHSpecificTest\NH1882\Book.cs" />
+    <Compile Include="NHSpecificTest\NH1882\Publisher.cs" />
+    <Compile Include="NHSpecificTest\NH1882\TestCollectionInitializingDuringFlush.cs" />
     <Compile Include="NHSpecificTest\NH3614\Entity.cs" />
     <Compile Include="NHSpecificTest\NH3614\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3505\Student.cs" />
@@ -3445,4 +3449,4 @@ if exist hibernate.cfg.xml (del hibernate.cfg.xml)
 if exist "$(ProjectDir)hibernate.cfg.xml" (copy "$(ProjectDir)hibernate.cfg.xml" "hibernate.cfg.xml")
 copy /y "..\..\..\NHibernate.DomainModel\ABC.hbm.xml" "ABC.hbm.xml"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

src/NHibernate/Event/Default/AbstractFlushingEventListener.cs

@@ -225,6 +225,7 @@ protected virtual void CascadeOnFlush(IEventSource session, IEntityPersister per
 		/// <item> <description>Deletes, in the order they were performed</description> </item>
 		/// </list>
 		/// </summary>
+		/// <param name="session">The session being flushed</param>
 		protected virtual void PerformExecutions(IEventSource session)
 		{
 			if (log.IsDebugEnabled)
@@ -235,6 +236,11 @@ protected virtual void PerformExecutions(IEventSource session)
 			try
 			{
 				session.ConnectionManager.FlushBeginning();
+				// IMPL NOTE : here we alter the flushing flag of the persistence context to allow
+				//		during-flush callbacks more leniency in regards to initializing proxies and
+				//		lazy collections during their processing.
+				// For more information, see HHH-2763 / NH-1882
+				session.PersistenceContext.Flushing = true;
 				// we need to lock the collection caches before
 				// executing entity inserts/updates in order to
 				// account for bidi associations
@@ -251,6 +257,7 @@ protected virtual void PerformExecutions(IEventSource session)
 			}
 			finally
 			{
+				session.PersistenceContext.Flushing = false;
 				session.ConnectionManager.FlushEnding();
 			}
 		}