Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit a234f9a

Browse files
authored
Merge pull request #4084 from alibaba/revert-4078-master
Revert "fix InaccessibleObjectException in jdk17. #4077"
2 parents ab82d0b + 0814909 commit a234f9a

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

pom.xml

+4-10
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>org.sonatype.oss</groupId>
7-
<artifactId>oss-parent</artifactId>
8-
<version>9</version>
9-
</parent>
10-
11-
<groupId>com.taobao.arthas</groupId>
5+
<groupId>com.alibaba</groupId>
126
<artifactId>fastjson</artifactId>
13-
<version>1.2.80-fix</version>
7+
<version>1.2.80</version>
148

159
<packaging>jar</packaging>
1610
<name>fastjson</name>
@@ -21,8 +15,8 @@
2115

2216
<properties>
2317
<junit.version>4.13.1</junit.version>
24-
<gpg.skip>false</gpg.skip>
25-
<javadoc.skip>false</javadoc.skip>
18+
<gpg.skip>true</gpg.skip>
19+
<javadoc.skip>true</javadoc.skip>
2620
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2721
<jdk.version>1.5</jdk.version>
2822
</properties>

src/main/java/com/alibaba/fastjson/util/TypeUtils.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.lang.reflect.*;
3939
import java.math.BigDecimal;
4040
import java.math.BigInteger;
41+
import java.security.AccessControlException;
4142
import java.sql.Clob;
4243
import java.text.ParseException;
4344
import java.text.SimpleDateFormat;
@@ -2552,7 +2553,7 @@ static void setAccessible(AccessibleObject obj) {
25522553
}
25532554
try {
25542555
obj.setAccessible(true);
2555-
} catch (Throwable error) {
2556+
} catch (AccessControlException error) {
25562557
setAccessibleEnable = false;
25572558
}
25582559
}

0 commit comments

Comments
 (0)