Exthex Version 0.2

1 files changed, 6 insertions, 10 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index 4507cd236..29f567324 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -417,25 +417,24 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 
   public synchronized void reloadDataBaseConfig() throws ConfigurationException {
 		
-		Logger.info("Read MOA-ID 2.x configuration from database.");
+		Logger.info("Read MOA-ID 2.0 configuration from database.");
 		moaidconfig = ConfigurationDBRead.getMOAIDConfiguration();
+		Logger.info("MOA-ID 2.0 is loaded.");
 		
 		if (moaidconfig == null) {
 			Logger.warn("NO MOA-ID configuration found.");
 			throw new ConfigurationException("config.18", null);
 		}
-
-		Logger.debug("MOA-ID 2.x configuration is loaded from database.");
-		Logger.info("MOA-ID 2.x starts initialization process ...");
-		
+						
 		//build STORK Config	
 		AuthComponentGeneral auth = getAuthComponentGeneral();
-		
 		ForeignIdentities foreign = auth.getForeignIdentities();
 		if (foreign == null ) {
 			Logger.warn("Error in MOA-ID Configuration. No STORK configuration found.");
 			
-		} //else   
+		} 
+		//TODO: commented because npe was thrown
+		//else   
 			//storkconfig = new STORKConfig(foreign.getSTORK(), props, rootConfigFileDir);
 		
 
@@ -787,9 +786,6 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
  * @throws ConfigurationException 
    */
   public ConnectionParameter getForeignIDConnectionParameter() throws ConfigurationException {
-	  if (ForeignIDConnectionParameter == null)
-		  throw new ConfigurationException("config.20", null);
-	  
 	  return ForeignIDConnectionParameter;
   }