[Nhibernate-commit] SF.net SVN: nhibernate:[5938] trunk/nhibernate/src/NHibernate/Engine/ QueryParameters.cs

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

Revision: 5938
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5938&view=rev
Author:   fabiomaulo
Date:     2011-06-16 17:20:18 +0000 (Thu, 16 Jun 2011)

Log Message:
-----------
Minor refactoring

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs

Modified: trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs	2011-06-16 16:59:59 UTC (rev 5937)
+++ trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs	2011-06-16 17:20:18 UTC (rev 5938)
@@ -72,9 +72,9 @@
 
 		public QueryParameters(IType[] positionalParameterTypes, object[] positionalParameterValues, IDictionary<string, TypedValue> namedParameters, IDictionary<string, LockMode> lockModes, RowSelection rowSelection, bool isReadOnlyInitialized, bool readOnly, bool cacheable, string cacheRegion, string comment, object[] collectionKeys, IResultTransformer transformer)
 		{
-			_positionalParameterTypes = positionalParameterTypes;
-			_positionalParameterValues = positionalParameterValues;
-			_namedParameters = namedParameters;
+			_positionalParameterTypes = positionalParameterTypes ?? new IType[0];
+			_positionalParameterValues = positionalParameterValues ?? new IType[0];
+			_namedParameters = namedParameters ?? new Dictionary<string, TypedValue>(1);
 			_lockModes = lockModes;
 			_rowSelection = rowSelection;
 			_cacheable = cacheable;
@@ -102,7 +102,7 @@
 		public IDictionary<string, TypedValue> NamedParameters
 		{
 			get { return _namedParameters; }
-			set { _namedParameters = value; }
+			internal set { _namedParameters = value; }
 		}
 
 		/// <summary>
@@ -150,15 +150,6 @@
 			get { return _isReadOnlyInitialized; }
 		}
 
-		private int SafeLength(Array array)
-		{
-			if (array == null)
-			{
-				return 0;
-			}
-			return array.Length;
-		}
-
 		public void LogParameters(ISessionFactoryImplementor factory)
 		{
 			var print = new Printer(factory);
@@ -200,8 +191,8 @@
 		/// </exception>
 		public void ValidateParameters()
 		{
-			int typesLength = SafeLength(PositionalParameterTypes);
-			int valuesLength = SafeLength(PositionalParameterValues);
+			int typesLength = PositionalParameterTypes.Length;
+			int valuesLength = PositionalParameterValues.Length;
 
 			if (typesLength != valuesLength)
 			{


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