log an error if AuthConfigLoader finds no MOAIDConfiguration

1 files changed, 20 insertions, 12 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java
index 1674715d1..b02c0946c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java
@@ -42,21 +42,29 @@ public class AuthConfigLoader implements Runnable {
 						
 				Logger.info("check for new config.");
 				MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration();
-				Date dbdate = moaidconfig.getTimestampItem();
-				Date pvprefresh = moaidconfig.getPvp2RefreshItem();
-
-				Date date = AuthConfigurationProvider.getTimeStamp();
-			
-				if (dbdate != null && dbdate.after(date)) {
-					AuthConfigurationProvider instance = AuthConfigurationProvider.getInstance();
-					instance.reloadDataBaseConfig();
-				}
 				
-				Date pvpdate = MOAMetadataProvider.getTimeStamp();
-				if (pvprefresh != null && pvpdate != null && pvprefresh.after(pvpdate)) {
-					MOAMetadataProvider.reInitialize();
+				if (moaidconfig != null) {									
+					Date dbdate = moaidconfig.getTimestampItem();
+					Date pvprefresh = moaidconfig.getPvp2RefreshItem();
+	
+					Date date = AuthConfigurationProvider.getTimeStamp();
+				
+					if (dbdate != null && dbdate.after(date)) {
+						AuthConfigurationProvider instance = AuthConfigurationProvider.getInstance();
+						instance.reloadDataBaseConfig();
+					}
+					
+					Date pvpdate = MOAMetadataProvider.getTimeStamp();
+					if (pvprefresh != null && pvpdate != null && pvprefresh.after(pvpdate)) {
+						MOAMetadataProvider.reInitialize();
+					}
+					
+				} else {
+					Logger.warn("MOA-ID Configuration is actually not found. Reuse old configuration.");
+					
 				}
 				
+				
 			} catch (Throwable e) {
 				Logger.warn("MOA-ID Configuration is actually not loadable. Reuse old configuration.", e);