[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Core/TypeConversion TypeConversionUtils.cs, 1.1, 1.2

[Mark P. <mar...@us...>]

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

Modified Files:
	TypeConversionUtils.cs 
Log Message:
SPRNET-453 - ConversionUtils should use ConvertFromInvariantString if failed to convert string value.

Index: TypeConversionUtils.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypeConversionUtils.cs	31 Jul 2007 18:16:08 -0000	1.1
--- TypeConversionUtils.cs	25 Aug 2007 16:07:35 -0000	1.2
***************
*** 97,101 ****
                      if (typeConverter != null && typeConverter.CanConvertFrom(newValue.GetType()))
                      {
!                         newValue = typeConverter.ConvertFrom(newValue);
                      }
                      else
--- 97,111 ----
                      if (typeConverter != null && typeConverter.CanConvertFrom(newValue.GetType()))
                      {
!                         try
!                         {
!                             newValue = typeConverter.ConvertFrom(newValue);
!                         }
!                         catch (Exception e)
!                         {
!                             if (newValue is string)
!                             {
!                                 newValue = typeConverter.ConvertFromInvariantString((string)newValue);
!                             }
!                         }
                      }
                      else