root
/
fastjson2
mirror of https://github.com/alibaba/fastjson2.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix ZonedId null pointer exception, for issue #1633

This commit is contained in:
shaojin.wensj 2023-07-16 19:25:22 +08:00
parent 184d1de6cf
commit 633c579cd0
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.35.android4</version>
<version>2.0.36.android4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
codegen-test/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.35.android4</version>
<version>2.0.36.android4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
core/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.35.android4</version>
<version>2.0.36.android4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
core/src/main/java/com/alibaba/fastjson2/time/ZoneId.java
View File

@ -16,7 +16,7 @@ public final class ZoneId {
public static final ZoneId SHANGHAI_ZONE_ID
= SHANGHAI_ZONE_ID_NAME.equals(DEFAULT_ZONE_ID.id)
? DEFAULT_ZONE_ID
: ZoneId.of(SHANGHAI_ZONE_ID_NAME);
: new ZoneId(TimeZone.getTimeZone(SHANGHAI_ZONE_ID_NAME));
public static ZoneId UTC = ZoneId.of("Z");
public final TimeZone timeZone;
public final String id;

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.35.android4</version>
<version>2.0.36.android4-SNAPSHOT</version>
<name>${project.artifactId}</name>
<description>Fastjson is a JSON processor (JSON parser + JSON generator) written in Java</description>
<packaging>pom</packaging>

2
safemode-test/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-parent</artifactId>
<version>2.0.35.android4</version>
<version>2.0.36.android4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>