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

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

Revision: 4393
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4393&view=rev
Author:   fabiomaulo
Date:     2009-05-31 18:38:56 +0000 (Sun, 31 May 2009)

Log Message:
-----------
Fix NH-1805

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs
    trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs	2009-05-31 16:39:08 UTC (rev 4392)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs	2009-05-31 18:38:56 UTC (rev 4393)
@@ -201,7 +201,9 @@
 			model.OptimisticLockMode = GetOptimisticLockMode(olNode);
 
 			// META ATTRIBUTES
-			model.MetaAttributes = GetMetas(classMapping, inheritedMetas);
+			model.MetaAttributes = classMapping != null
+			                       	? GetMetas(classMapping, inheritedMetas)
+			                       	: GetMetas(node.SelectNodes(HbmConstants.nsMeta, namespaceManager), inheritedMetas);
 
 			// PERSISTER
 			XmlAttribute persisterNode = node.Attributes["persister"];

Modified: trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs	2009-05-31 16:39:08 UTC (rev 4392)
+++ trunk/nhibernate/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs	2009-05-31 18:38:56 UTC (rev 4393)
@@ -165,12 +165,20 @@
 			Assert.That(col.ComparerClassName, Text.StartsWith("NHibernate.Test.MappingTest.NonExistingComparator"));
 		}
 
-		[Test, Ignore("Not fixed yet.")]
+		[Test]
 		public void ReadSubClasses()
 		{
 			PersistentClass cm = cfg.GetClassMapping("NHibernate.Test.MappingTest.DomesticAnimal");
 			MetaAttribute metaAttribute = cm.GetMetaAttribute("Auditable");
 			Assert.That(metaAttribute, Is.Not.Null);
+			
+			cm = cfg.GetClassMapping("NHibernate.Test.MappingTest.Cat");
+			metaAttribute = cm.GetMetaAttribute("Auditable");
+			Assert.That(metaAttribute, Is.Not.Null);
+			
+			cm = cfg.GetClassMapping("NHibernate.Test.MappingTest.Dog");
+			metaAttribute = cm.GetMetaAttribute("Auditable");
+			Assert.That(metaAttribute, Is.Not.Null);
 		}
 	}
 }
\ No newline at end of file


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