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

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

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

Log Message:
-----------
- Fix test case
- Minor refactoring

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Engine/ResultSetMappingDefinition.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Mappings.hbm.xml

Modified: trunk/nhibernate/src/NHibernate/Engine/ResultSetMappingDefinition.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/ResultSetMappingDefinition.cs	2009-01-02 18:37:13 UTC (rev 3971)
+++ trunk/nhibernate/src/NHibernate/Engine/ResultSetMappingDefinition.cs	2009-01-02 18:41:32 UTC (rev 3972)
@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 
 using NHibernate.Engine.Query.Sql;
@@ -8,7 +7,7 @@
 	public class ResultSetMappingDefinition
 	{
 		private readonly string name;
-		private readonly IList<INativeSQLQueryReturn> queryReturns = new List<INativeSQLQueryReturn>();
+		private readonly List<INativeSQLQueryReturn> queryReturns = new List<INativeSQLQueryReturn>();
 
 		public ResultSetMappingDefinition(string name)
 		{
@@ -22,14 +21,15 @@
 
 		public void AddQueryReturn(INativeSQLQueryReturn queryReturn)
 		{
-			queryReturns.Add(queryReturn);
+			if (queryReturn != null)
+			{
+				queryReturns.Add(queryReturn);
+			}
 		}
 
 		public INativeSQLQueryReturn[] GetQueryReturns()
 		{
-			INativeSQLQueryReturn[] result = new INativeSQLQueryReturn[queryReturns.Count];
-			queryReturns.CopyTo(result, 0);
-			return result;
+			return queryReturns.ToArray();
 		}
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Mappings.hbm.xml	2009-01-02 18:37:13 UTC (rev 3971)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1612/Mappings.hbm.xml	2009-01-02 18:41:32 UTC (rev 3972)
@@ -73,7 +73,7 @@
     AND     ci.area_type = 'CI'
   </sql-query>
 
-  <sql-query name="CountryStatisticsLoader" xml:space="preserve">
+  <sql-query name="AreaStatisticsLoader" xml:space="preserve">
     <load-collection role="Area.Statistics" alias="s">
       <return-property name="key" column="code" />
       <return-property name="index" column="year" />


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