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

Fix DateFormat time zone is not restored. #2548

Closed
wants to merge 4 commits into from
Closed

Fix DateFormat time zone is not restored. #2548

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ffbce9
fix issue##2547
Nov 19, 2023
58471c3
fix issue##2547
Nov 19, 2023
a6c1780
Add test for the pr(deserializeToDate), change the import format.
Nov 19, 2023
b48f927
Merge branch 'main' into main
Carpe-Wang Nov 19, 2023
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
8 changes: 4 additions & 4 deletions gson/src/main/java/com/google/gson/internal/bind/DateTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.ParsePosition;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.*;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your IDE probably did this for you, but please undo it. :-)
This project follows the Google Java Style Guide, notably the bit excluding wildcard imports.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, Idea change it automatically.


/**
* Adapter for Date. Although this class appears stateless, it is not. DateFormat captures its time
Expand Down Expand Up @@ -84,10 +81,13 @@ private Date deserializeToDate(JsonReader in) throws IOException {
String s = in.nextString();
synchronized (dateFormats) {
for (DateFormat dateFormat : dateFormats) {
TimeZone originalTimeZone = dateFormat.getTimeZone();
try {
return dateFormat.parse(s);
} catch (ParseException ignored) {
// OK: try the next format
} finally {
dateFormat.setTimeZone(originalTimeZone);
}
}
}
Expand Down