Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Two possible fixes ms Length varies, Timezone difference in string #25

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Two possible fixes ms Length varies, Timezone difference in string #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e91f855
Updating potential fixes for ms length being variable and for timezon…
B9Tony Apr 12, 2016
e72e617
Include #else for not dotnet4 code
B9Tony Apr 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions fastJSON/JSON.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,12 @@ private Guid CreateGuid(string s)

private DateTime CreateDateTime(string value)
{
// This resolves the ms issue and the timezone issue brought up by bruce965 on Jan 13, 2015,
// and it's faster that the previous method but it might only work on dotnet 4 and up
// - Voir "Tony" Hillaire (B9Tony) 4/12/2016
#if net4
return DateTime.Parse(value, null, System.Globalization.DateTimeStyles.RoundtripKind);
#else
bool utc = false;
// 0123456789012345678 9012 9/3
// datetime format = yyyy-MM-ddTHH:mm:ss .nnn Z
Expand All @@ -747,16 +753,22 @@ private DateTime CreateDateTime(string value)
hour = CreateInteger(value, 11, 2);
min = CreateInteger(value, 14, 2);
sec = CreateInteger(value, 17, 2);
if (value.Length > 21 && value[19] == '.')
ms = CreateInteger(value, 20, 3);

// Moved so existence of 'Z' could be used in ms Length calculation - Voir "Tony" Hillaire(B9Tony) 4/12/2016
if (value[value.Length - 1] == 'Z')
utc = true;
// changed ms Length calculation from fixed 3 to length-21 if utc Z is there or length-20 if it's not - Voir "Tony" Hillaire (B9Tony) 4/12/2016
// 2016-03-24T21:52:21.96Z, 2016-03-24T21:52:21.4Z, 2016-03-29T20:02:08.88, 2016-03-25T18:37:12.757Z
if (value.Length > 21 && value[19] == '.')
ms = CreateInteger(value, 20, (value.Length - (utc ? 21 : 20)));

// original location of 'Z' - utc line

if (_params.UseUTCDateTime == false && utc == false)
return new DateTime(year, month, day, hour, min, sec, ms);
else
return new DateTime(year, month, day, hour, min, sec, ms, DateTimeKind.Utc).ToLocalTime();
#endif

}

private object CreateArray(List<object> data, Type pt, Type bt, Dictionary<string, object> globalTypes)
Expand Down