[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Core/TypeConversion TypeConversionUtils.cs, 1.3, 1.4

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Core/TypeConversion
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4517/src/Spring/Spring.Core/Core/TypeConversion

Modified Files:
	TypeConversionUtils.cs 
Log Message:
SPRNET-898

Index: TypeConversionUtils.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TypeConversionUtils.cs	27 Aug 2007 09:38:38 -0000	1.3
--- TypeConversionUtils.cs	20 Mar 2008 23:58:16 -0000	1.4
***************
*** 118,122 ****
                          else
                          {
!                             // finally look if it's an enum
                              if (requiredType != null 
                                  && requiredType.IsEnum
--- 118,122 ----
                          else
                          {
!                             // look if it's an enum
                              if (requiredType != null 
                                  && requiredType.IsEnum
***************
*** 138,145 ****
                                  }
                              }
                              else
                              {
                                  throw new TypeMismatchException(
!                                     CreatePropertyChangeEventArgs(propertyName, null, newValue), requiredType);
                              }
                          }
--- 138,150 ----
                                  }
                              }
+                             else if (newValue is IConvertible)
+                             {
+                                 // last resort - try ChangeType
+                                 newValue = Convert.ChangeType(newValue, requiredType);
+                             }
                              else
                              {
                                  throw new TypeMismatchException(
!                                     CreatePropertyChangeEventArgs(propertyName, null, newValue), requiredType);                                                                    
                              }
                          }