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

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

Revision: 5779
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5779&view=rev
Author:   fabiomaulo
Date:     2011-04-27 22:04:24 +0000 (Wed, 27 Apr 2011)

Log Message:
-----------
Fixed merge of component-as-id customization

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-27 21:53:31 UTC (rev 5778)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersHolder.cs	2011-04-27 22:04:24 UTC (rev 5779)
@@ -354,6 +354,7 @@
 			MergeDictionary(mapKeyManyToManyCustomizers, source.mapKeyManyToManyCustomizers);
 			MergeDictionary(mapKeyElementCustomizers, source.mapKeyElementCustomizers);
 			MergeDictionary(dynamicComponentCustomizers, source.dynamicComponentCustomizers);
+			MergeDictionary(componentAsIdPropertyCustomizers, source.componentAsIdPropertyCustomizers);
 		}
 
 		#endregion

Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/CustomizerHolderMergeTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/CustomizerHolderMergeTest.cs	2011-04-27 21:53:31 UTC (rev 5778)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/CustomizerHolderMergeTest.cs	2011-04-27 22:04:24 UTC (rev 5779)
@@ -343,5 +343,18 @@
 			called.Should().Be.True();
 		}
 
+		[Test]
+		public void MergeShouldMergeComponentAsIdAttributesMapper()
+		{
+			var emptyHolder = new CustomizersHolder();
+			var holder = new CustomizersHolder();
+			var called = false;
+
+			holder.AddCustomizer(propertyPath, (IComponentAsIdAttributesMapper x) => called = true);
+			emptyHolder.Merge(holder);
+			emptyHolder.InvokeCustomizers(propertyPath, (IComponentAsIdAttributesMapper)null);
+
+			called.Should().Be.True();
+		}
 	}
 }
\ No newline at end of file


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