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

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

Revision: 5303
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5303&view=rev
Author:   fabiomaulo
Date:     2010-12-10 18:12:42 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
Fix NH-2425

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
    trunk/nhibernate/src/NHibernate/Cfg/NamedXmlDocument.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs	2010-12-10 16:47:11 UTC (rev 5302)
+++ trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs	2010-12-10 18:12:42 UTC (rev 5303)
@@ -9,6 +9,7 @@
 using System.Text;
 using System.Xml;
 using System.Xml.Schema;
+using System.Xml.Serialization;
 using Iesi.Collections;
 using Iesi.Collections.Generic;
 
@@ -78,9 +79,10 @@
 
 		private static readonly IInternalLogger log = LoggerProvider.LoggerFor(typeof(Configuration));
 
-
 		protected internal SettingsFactory settingsFactory;
 
+		private readonly XmlSerializer mappingDocumentSerializer = new XmlSerializer(typeof(HbmMapping));
+
 		#region ISerializable Members
 		public Configuration(SerializationInfo info, StreamingContext context)
 		{
@@ -1771,7 +1773,7 @@
 				{
 					var hbmDocument = new XmlDocument();
 					hbmDocument.Load(reader);
-					return new NamedXmlDocument(name, hbmDocument);
+					return new NamedXmlDocument(name, hbmDocument, mappingDocumentSerializer);
 				}
 				catch (MappingException)
 				{

Modified: trunk/nhibernate/src/NHibernate/Cfg/NamedXmlDocument.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/NamedXmlDocument.cs	2010-12-10 16:47:11 UTC (rev 5302)
+++ trunk/nhibernate/src/NHibernate/Cfg/NamedXmlDocument.cs	2010-12-10 18:12:42 UTC (rev 5303)
@@ -11,7 +11,7 @@
 		private readonly string name;
 		private readonly HbmMapping document;
 
-		public NamedXmlDocument(string name, XmlDocument document)
+		public NamedXmlDocument(string name, XmlDocument document, XmlSerializer mappingDocumentSerializer)
 		{
 			if (document == null)
 			{
@@ -24,7 +24,7 @@
 			}
 			using (var reader = new StringReader(document.DocumentElement.OuterXml))
 			{
-				this.document = (HbmMapping)new XmlSerializer(typeof(HbmMapping)).Deserialize(reader);
+				this.document = (HbmMapping)mappingDocumentSerializer.Deserialize(reader);
 			}
 		}
 


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