[Nhibernate-commit] SF.net SVN: nhibernate:[4586] branches/2.1.x/nhibernate/src/NHibernate

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

Revision: 4586
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4586&view=rev
Author:   fabiomaulo
Date:     2009-07-05 22:32:50 +0000 (Sun, 05 Jul 2009)

Log Message:
-----------
Fix NH-1867

Modified Paths:
--------------
    branches/2.1.x/nhibernate/src/NHibernate/Util/StringHelper.cs
    branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/

Modified: branches/2.1.x/nhibernate/src/NHibernate/Util/StringHelper.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Util/StringHelper.cs	2009-07-05 18:50:45 UTC (rev 4585)
+++ branches/2.1.x/nhibernate/src/NHibernate/Util/StringHelper.cs	2009-07-05 22:32:50 UTC (rev 4586)
@@ -213,6 +213,14 @@
 		/// <returns></returns>
 		public static string Unqualify(string qualifiedName)
 		{
+			if(qualifiedName.IndexOf('`') > 0)
+			{
+				// less performance but correctly manage generics classes
+				// where the entity-name was not specified
+				// Note: the enitty-name is mandatory when the user want work with different type-args
+				// for the same generic-entity implementation
+				return GetClassname(qualifiedName);
+			}
 			return Unqualify(qualifiedName, ".");
 		}
 

Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-07-05 18:50:45 UTC (rev 4585)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-07-05 22:32:50 UTC (rev 4586)
@@ -532,6 +532,7 @@
     <Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
     <Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1864\Model.cs" />
+    <Compile Include="NHSpecificTest\NH1867\AddMappingTest.cs" />
     <Compile Include="NHSpecificTest\NH1868\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1868\Model.cs" />
     <Compile Include="NHSpecificTest\NH473\Child.cs" />


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