Merge branch 'develop' into feature/jsr-310-localdate

ical4j · Jan 4, 2022 · 708ea17 · 708ea17
2 parents c2bf3be + de9b686
commit 708ea17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -61,6 +61,7 @@ dependencies {
 
     testCompile "org.codehaus.groovy:groovy:$groovyVersion",
             "org.slf4j:slf4j-log4j12:$slf4jVersion",
+            "org.apache.logging.log4j:log4j:$log4jVersion",
             "org.ccil.cowan.tagsoup:tagsoup:$tagsoupVersion",
             "org.cache2k:cache2k-jcache:$jcacheVersion",
             "org.codehaus.groovy:groovy-xml:$groovyVersion"

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,5 @@
-slf4jVersion = 1.7.30
+slf4jVersion = 1.7.32
+log4jVersion = 2.15.0
 commonsCodecVersion = 1.11
 commonsLangVersion = 3.8.1
 commonsCollectionsVersion = 4.1

diff --git a/src/main/java/net/fortuna/ical4j/util/ResourceLoader.java b/src/main/java/net/fortuna/ical4j/util/ResourceLoader.java
@@ -76,7 +76,9 @@ public static URL getResource(String name) {
     public static InputStream getResourceAsStream(String name) {
         InputStream stream = null;
         try {
-            stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
+            if (Thread.currentThread().getContextClassLoader() != null) {
+                stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
+            }
         } catch (SecurityException e) {
             LOG.info("Unable to access context classloader, using default. " + e.getMessage());
         }