-Fix bug when JValue of type string has a null string value

-Fix JToken casting bugs to float and decimal
This commit is contained in:
JamesNK
2009-04-30 10:12:42 +00:00
parent 52f8657106
commit a0a8599d3d
4 changed files with 30 additions and 8 deletions
+3 -3
View File
@@ -517,7 +517,7 @@ namespace Newtonsoft.Json.Linq
if (v == null || !ValidateFloat(v, true))
throw new ArgumentException("Can not convert {0} to Decimal.".FormatWith(CultureInfo.InvariantCulture, GetType(v)));
return (decimal?)v.Value;
return (v.Value != null) ? (decimal?)Convert.ToDecimal(v.Value) : null;
}
/// <summary>
@@ -613,7 +613,7 @@ namespace Newtonsoft.Json.Linq
if (v == null || !ValidateFloat(v, true))
throw new ArgumentException("Can not convert {0} to Single.".FormatWith(CultureInfo.InvariantCulture, GetType(v)));
return (float?)v.Value;
return (v.Value != null) ? (float?)Convert.ToSingle(v.Value) : null;
}
/// <summary>
@@ -627,7 +627,7 @@ namespace Newtonsoft.Json.Linq
if (v == null || !ValidateFloat(v, false))
throw new ArgumentException("Can not convert {0} to Decimal.".FormatWith(CultureInfo.InvariantCulture, GetType(v)));
return (decimal)v.Value;
return Convert.ToDecimal(v.Value);
}
/// <summary>