nhibernate-commit

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3212/NHibernate/SqlCommand

Modified Files:
	Parameter.cs 
Log Message:
Fixed problem with Equals and null TableAlias

Index: Parameter.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/Parameter.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Parameter.cs	25 May 2004 17:14:27 -0000	1.5
--- Parameter.cs	27 May 2004 13:55:39 -0000	1.6
***************
*** 154,161 ****
  
  			//Step 3: Check each important field
- 			return this.DbType.Equals(rhs.DbType) 
- 					&& this.Name.Equals(rhs.Name)
- 					&& this.TableAlias.Equals(rhs.TableAlias);
  			
  		}
  
--- 154,174 ----
  
  			//Step 3: Check each important field
  			
+ 			// these 2 fields will not be null so compare them...
+ 			if(this.DbType.Equals(rhs.DbType)==false || this.Name.Equals(rhs.Name)==false) return false;
+ 
+ 			// becareful with TableAlias being null
+ 			if(this.TableAlias==null && rhs.TableAlias==null) 
+ 			{
+ 				return true;
+ 			}
+ 			else if (this.TableAlias==null && rhs.TableAlias!=null) 
+ 			{
+ 				return false;
+ 			}
+ 			else 
+ 			{
+ 				return this.TableAlias.Equals(rhs.TableAlias);
+ 			}
  		}