joerg/content
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix NPE

Browse source
This commit is contained in:
Jörg Prante 2020-10-09 17:59:45 +02:00
parent 21439c133b
commit 8774fcc1dd
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
content-config/src/main/java/org/xbib/content/config/ConfigLoader.java
View file

@ -42,9 +42,11 @@ public class ConfigLoader {
if (settings != null) { if (settings != null) {
return settings; return settings;
} }
settings = createClasspathSettings(classLoader, applicationName, fileNameWithoutSuffix); if (classLoader != null) {
if (settings != null) { settings = createClasspathSettings(classLoader, applicationName, fileNameWithoutSuffix);
return settings; if (settings != null) {
return settings;
}
} }
settings = createClasspathSettings(ConfigLoader.class.getClassLoader(), applicationName, fileNameWithoutSuffix); settings = createClasspathSettings(ConfigLoader.class.getClassLoader(), applicationName, fileNameWithoutSuffix);
if (settings != null) { if (settings != null) {

2
gradle.properties
View file

@ -1,6 +1,6 @@
group = org.xbib group = org.xbib
name = content name = content
version = 2.5.4 version = 2.5.5
gradle.wrapper.version = 6.6.1 gradle.wrapper.version = 6.6.1
xbib.net.version = 2.1.0 xbib.net.version = 2.1.0