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

[<pa...@us...>]

Revision: 5278
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5278&view=rev
Author:   patearl
Date:     2010-11-28 19:12:13 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
Fixed incorrect usages of StringHelper.Split.  This is a partial fix for using composite types as HQL parameter values.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AbstractNullnessCheckNode.cs
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs
    trunk/nhibernate/src/NHibernate/Id/IncrementGenerator.cs

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AbstractNullnessCheckNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AbstractNullnessCheckNode.cs	2010-11-28 04:35:11 UTC (rev 5277)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AbstractNullnessCheckNode.cs	2010-11-28 19:12:13 UTC (rev 5278)
@@ -142,7 +142,7 @@
 					nodeText = nodeText.Substring( 0, nodeText.Length - 1 );
 				}
 
-				string[] splits = StringHelper.Split( ", ", nodeText );
+				string[] splits = nodeText.Split(new[] { ", " }, StringSplitOptions.None);
 
 				if ( count != splits.Length ) 
 				{

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs	2010-11-28 04:35:11 UTC (rev 5277)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs	2010-11-28 19:12:13 UTC (rev 5278)
@@ -221,7 +221,7 @@
 				{
 					nodeText = nodeText.Substring( 0, nodeText.Length - 1 );
 				}
-				String[] splits = StringHelper.Split( ", ", nodeText );
+				string[] splits = nodeText.Split(new[] { ", " }, StringSplitOptions.None);
 
 				if ( count != splits.Length ) 
 				{

Modified: trunk/nhibernate/src/NHibernate/Id/IncrementGenerator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Id/IncrementGenerator.cs	2010-11-28 04:35:11 UTC (rev 5277)
+++ trunk/nhibernate/src/NHibernate/Id/IncrementGenerator.cs	2010-11-28 19:12:13 UTC (rev 5278)
@@ -48,7 +48,7 @@
 
 			if (!parms.TryGetValue("tables", out tableList))
 				parms.TryGetValue(PersistentIdGeneratorParmsNames.Tables, out tableList);
-			string[] tables = StringHelper.Split(", ", tableList);
+			string[] tables = tableList.Split(", ".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
 			if (!parms.TryGetValue("column", out column))
 				parms.TryGetValue(PersistentIdGeneratorParmsNames.PK, out column);
 			returnClass = type.ReturnedClass;


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