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

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

Revision: 4648
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4648&view=rev
Author:   fabiomaulo
Date:     2009-07-17 14:42:29 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
Merge r4647

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/AbstractDecoratable.cs
    trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/AbstractDecoratable.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/AbstractDecoratable.cs	2009-07-17 14:24:31 UTC (rev 4647)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/AbstractDecoratable.cs	2009-07-17 14:42:29 UTC (rev 4648)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Xml.Serialization;
 using NHibernate.Mapping;
 using NHibernate.Util;
 
@@ -10,7 +11,12 @@
 	{
 		private static readonly IDictionary<string, MetaAttribute> EmptyMetaData = new CollectionHelper.EmptyMapClass<string, MetaAttribute>();
 
+		[NonSerialized]
+		[XmlIgnore]
 		private IDictionary<string, MetaAttribute> mappedMetaData;
+
+		[NonSerialized]
+		[XmlIgnore]
 		private IDictionary<string, MetaAttribute> inheritableMetaData;
 
 		public virtual IDictionary<string, MetaAttribute> MappedMetaData

Modified: trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs	2009-07-17 14:24:31 UTC (rev 4647)
+++ trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs	2009-07-17 14:42:29 UTC (rev 4648)
@@ -1,4 +1,6 @@
+using System.IO;
 using NHibernate.Cfg;
+using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping;
 using NUnit.Framework;
 
@@ -180,5 +182,17 @@
 			metaAttribute = cm.GetMetaAttribute("Auditable");
 			Assert.That(metaAttribute, Is.Not.Null);
 		}
+
+		[Test]
+		public void XmlSerialization()
+		{
+			// NH-1865 (have a look to comments in JIRA)
+			var mdp = new MappingDocumentParser();
+			using (Stream stream = GetType().Assembly.GetManifestResourceStream("NHibernate.Test.MappingTest.Wicked.hbm.xml"))
+			{
+				HbmMapping mapping = mdp.Parse(stream);
+				Assert.That(mapping, Is.XmlSerializable);
+			}
+		}
 	}
 }
\ No newline at end of file


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