From 66ed48b68d0d8d534fc0d28c2ad0426645903db9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 5 Dec 2017 16:20:04 +0100
Subject: [server] Fix NPE if no existing config in DB

---
 .../src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'dozentenmodulserver/src/main/java/org/openslx')

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java
index ea3c7ae0..df0349fa 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java
@@ -16,12 +16,14 @@ public class RuntimeConfig {
 
 		@Override
 		protected SatelliteConfig update() {
-			SatelliteConfig satConfig, readConfig;
+			SatelliteConfig satConfig = null, readConfig = null;
 			try {
 				readConfig = DbConfiguration.getSatelliteConfig();
-				satConfig = readConfig.deepCopy();
 			} catch (SQLException e) {
-				readConfig = satConfig = null;
+				// Fall through
+			}
+			if (readConfig != null) {
+				satConfig = readConfig.deepCopy();
 			}
 			if (satConfig == null) {
 				satConfig = new SatelliteConfig();
-- 
cgit v1.2.3-55-g7522