From 8774fcc1dd7a8e105ce0b1689ce8926e7e7defda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rg=20Prante?= <joergprante@gmail.com>
Date: Fri, 9 Oct 2020 17:59:45 +0200
Subject: [PATCH] fix NPE

---
 .../main/java/org/xbib/content/config/ConfigLoader.java   | 8 +++++---
 gradle.properties                                         | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/content-config/src/main/java/org/xbib/content/config/ConfigLoader.java b/content-config/src/main/java/org/xbib/content/config/ConfigLoader.java
index 8e7ced8..4171f98 100644
--- a/content-config/src/main/java/org/xbib/content/config/ConfigLoader.java
+++ b/content-config/src/main/java/org/xbib/content/config/ConfigLoader.java
@@ -42,9 +42,11 @@ public class ConfigLoader {
             if (settings != null) {
                 return settings;
             }
-            settings = createClasspathSettings(classLoader, applicationName, fileNameWithoutSuffix);
-            if (settings != null) {
-                return settings;
+            if (classLoader != null) {
+                settings = createClasspathSettings(classLoader, applicationName, fileNameWithoutSuffix);
+                if (settings != null) {
+                    return settings;
+                }
             }
             settings = createClasspathSettings(ConfigLoader.class.getClassLoader(), applicationName, fileNameWithoutSuffix);
             if (settings != null) {
diff --git a/gradle.properties b/gradle.properties
index f468e11..8f0646a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group = org.xbib
 name = content
-version = 2.5.4
+version = 2.5.5
 
 gradle.wrapper.version = 6.6.1
 xbib.net.version = 2.1.0