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

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

Revision: 3971
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3971&view=rev
Author:   fabiomaulo
Date:     2009-01-02 18:37:13 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
Fix NH-1633

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs
    trunk/nhibernate/src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs	2009-01-02 14:41:58 UTC (rev 3970)
+++ trunk/nhibernate/src/NHibernate/Loader/Custom/CustomLoader.cs	2009-01-02 18:37:13 UTC (rev 3971)
@@ -368,7 +368,8 @@
 			public object BuildResultRow(object[] data, IDataReader resultSet, bool hasTransformer, ISessionImplementor session)
 			{
 				object[] resultRow;
-				if (!hasScalars)
+				// NH Different behavior (patched in NH-1612 to solve Hibernate issue HHH-2831).
+				if (!hasScalars && hasTransformer)
 				{
 					resultRow = data;
 				}

Modified: trunk/nhibernate/src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs	2009-01-02 14:41:58 UTC (rev 3970)
+++ trunk/nhibernate/src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs	2009-01-02 18:37:13 UTC (rev 3971)
@@ -214,7 +214,8 @@
 
 			IList results = s.GetNamedQuery("UserSessionData").SetParameter("uname", "%in").List();
 			Assert.AreEqual(2, results.Count);
-			gavin = (User) ((object[]) results[0])[0];
+			// NH Different behavior : NH1612, HHH-2831
+			gavin = (User)results[0];
 			Assert.AreEqual("gavin", gavin.Name);
 			Assert.AreEqual(2, gavin.Session.Count);
 			t.Commit();


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