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

Commit

Permalink
Merge pull request #4084 from alibaba/revert-4078-master
Browse files Browse the repository at this point in the history
Revert "fix InaccessibleObjectException in jdk17. #4077"
  • Loading branch information
wenshao authored Apr 20, 2022
2 parents ab82d0b + 0814909 commit a234f9a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
14 changes: 4 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>

<groupId>com.taobao.arthas</groupId>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.80-fix</version>
<version>1.2.80</version>

<packaging>jar</packaging>
<name>fastjson</name>
Expand All @@ -21,8 +15,8 @@

<properties>
<junit.version>4.13.1</junit.version>
<gpg.skip>false</gpg.skip>
<javadoc.skip>false</javadoc.skip>
<gpg.skip>true</gpg.skip>
<javadoc.skip>true</javadoc.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.5</jdk.version>
</properties>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/alibaba/fastjson/util/TypeUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.lang.reflect.*;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.security.AccessControlException;
import java.sql.Clob;
import java.text.ParseException;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -2552,7 +2553,7 @@ static void setAccessible(AccessibleObject obj) {
}
try {
obj.setAccessible(true);
} catch (Throwable error) {
} catch (AccessControlException error) {
setAccessibleEnable = false;
}
}
Expand Down

0 comments on commit a234f9a

Please sign in to comment.