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

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

Revision: 5620
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5620&view=rev
Author:   fabiomaulo
Date:     2011-04-06 13:41:56 +0000 (Wed, 06 Apr 2011)

Log Message:
-----------
Merge with null

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersHolder.cs
    trunk/nhibernate/src/NHibernate.Test/MappingByCode/CustomizerHolderMergeTest.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersHolder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersHolder.cs	2011-04-06 12:43:42 UTC (rev 5619)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersHolder.cs	2011-04-06 13:41:56 UTC (rev 5620)
@@ -295,6 +295,10 @@
 
 		public void Merge(CustomizersHolder source)
 		{
+			if (source == null)
+			{
+				return;
+			}
 			MergeDictionary(rootClassCustomizers, source.rootClassCustomizers);
 			MergeDictionary(subclassCustomizers, source.subclassCustomizers);
 			MergeDictionary(joinedClassCustomizers, source.joinedClassCustomizers);

Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/CustomizerHolderMergeTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/CustomizerHolderMergeTest.cs	2011-04-06 12:43:42 UTC (rev 5619)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/CustomizerHolderMergeTest.cs	2011-04-06 13:41:56 UTC (rev 5620)
@@ -15,6 +15,13 @@
 		private PropertyPath propertyPath = new PropertyPath(null, typeof(MyClass).GetProperty("Bar"));
 
 		[Test]
+		public void WhenMergeWithNullThenNotThrow()
+		{
+			var emptyHolder = new CustomizersHolder();
+			emptyHolder.Executing(x=> x.Merge(null)).NotThrows();
+		}
+
+		[Test]
 		public void MergeShouldMergeAnyMapper()
 		{
 			var emptyHolder = new CustomizersHolder();


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