Merge branch 'stable-5.5'
* stable-5.5: Fix NPE in SystemReader in tests Change-Id: I8500caeca99fe05ce9a80b54330b72e23670a46b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
commit
ca8887a074
|
@ -428,9 +428,6 @@ private void updateAll(Config config)
|
||||||
updateAll(config.getBaseConfig());
|
updateAll(config.getBaseConfig());
|
||||||
if (config instanceof FileBasedConfig) {
|
if (config instanceof FileBasedConfig) {
|
||||||
FileBasedConfig cfg = (FileBasedConfig) config;
|
FileBasedConfig cfg = (FileBasedConfig) config;
|
||||||
if (!cfg.getFile().exists()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (cfg.isOutdated()) {
|
if (cfg.isOutdated()) {
|
||||||
LOG.debug("loading config {}", cfg); //$NON-NLS-1$
|
LOG.debug("loading config {}", cfg); //$NON-NLS-1$
|
||||||
cfg.load();
|
cfg.load();
|
||||||
|
|
Loading…
Reference in New Issue