From 640fb8644d6f9c82e891a85aa85733d25f5b680d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81?= Date: Tue, 1 Nov 2022 19:13:08 +0800 Subject: [PATCH 1/2] fix:fix "ClassLoader.getSystemResourceAsStream" NullPointException in jdk17 --- .../src/main/java/org/mp4parser/PropertyBoxParserImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java b/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java index 14980cf32..5e05ad932 100644 --- a/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java +++ b/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java @@ -49,11 +49,15 @@ public PropertyBoxParserImpl(String... customProperties) { try { mapping = new Properties(); try { - mapping.load(is); ClassLoader cl = Thread.currentThread().getContextClassLoader(); if (cl == null) { cl = ClassLoader.getSystemClassLoader(); } + if (null == is) { + is = cl.getResourceAsStream("isoparser2-default.properties"); + } + mapping.load(is); + Enumeration enumeration = cl.getResources("isoparser-custom.properties"); while (enumeration.hasMoreElements()) { From d8746d243073eb64d6f9373717534729e23e5929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=A2=81?= Date: Thu, 4 May 2023 09:37:43 +0800 Subject: [PATCH 2/2] Update isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit keep code style uniform Co-authored-by: Michal BoroĊˆ --- .../src/main/java/org/mp4parser/PropertyBoxParserImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java b/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java index 5e05ad932..26d4c4e6a 100644 --- a/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java +++ b/isoparser/src/main/java/org/mp4parser/PropertyBoxParserImpl.java @@ -53,7 +53,7 @@ public PropertyBoxParserImpl(String... customProperties) { if (cl == null) { cl = ClassLoader.getSystemClassLoader(); } - if (null == is) { + if (is == null) { is = cl.getResourceAsStream("isoparser2-default.properties"); } mapping.load(is);