1 files changed, 26 insertions, 32 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index 014a9ec03..af23d4c78 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -1155,14 +1155,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 		CreateXMLSignatureResponse csresp = new CreateXMLSignatureResponseParser(
 				xmlCreateXMLSignatureReadResponse).parseResponse();
 
-		
-		Element signature = csresp.getDsigSignature();
-		
-		
 		try {
-			String test = DOMUtils.serializeNode(signature);
-			
-			
 			String serializedAssertion = DOMUtils.serializeNode(csresp
 					.getSamlAssertion());
 			session.setAuthBlock(serializedAssertion);
@@ -1695,36 +1688,37 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	   * @param signature XMLDSIG signature
 	   * @return Identity link assertion
 	 * @throws SZRGWClientException 
-	 * @throws ConfigurationException 
 	   */
-	     public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, Element signature) throws SZRGWClientException, ConfigurationException {
+	     public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, Element signature) throws SZRGWClientException {
 
 		    SZRGWClient client = new SZRGWClient();
 		 
-		   	AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-		   	ConnectionParameter connectionParameters = authConf.getForeignIDConnectionParameter();
-
-		   	client.setAddress(connectionParameters.getUrl());
-		   	if (connectionParameters.getUrl().toLowerCase().startsWith("https:")) {
-		   		Logger.debug("Initialisiere SSL Verbindung");
-		   		try {
-		   			client.setSSLSocketFactory(SSLUtils.getSSLSocketFactory(AuthConfigurationProvider.getInstance(), connectionParameters));
-		   			
-		   		} catch (IOException e) {
-		   			Logger.error("Could not initialize SSL Factory", e);
-		   			throw new SZRGWClientException("Could not initialize SSL Factory");
-		   			
-		   		} catch (GeneralSecurityException e) {
-		   			Logger.error("Could not initialize SSL Factory", e);
-		   			throw new SZRGWClientException("Could not initialize SSL Factory");
-		   			
-		    	} catch (PKIException e) {
-		    		Logger.error("Could not initialize SSL Factory", e);
-		    		throw new SZRGWClientException("Could not initialize SSL Factory");
-		    	} 
-		   	}
-		   		
+		    try {
+		    	AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
+		    	ConnectionParameter connectionParameters = authConf.getForeignIDConnectionParameter();
+
+		    	client.setAddress(connectionParameters.getUrl());
+		    	if (connectionParameters.getUrl().toLowerCase().startsWith("https:")) {
+		    		Logger.debug("Initialisiere SSL Verbindung");
+		    		try {
+		    			client.setSSLSocketFactory(SSLUtils.getSSLSocketFactory(AuthConfigurationProvider.getInstance(), connectionParameters));
+		    		} catch (IOException e) {
+		    			Logger.error("Could not initialize SSL Factory", e);
+		    			throw new SZRGWClientException("Could not initialize SSL Factory");
+		    		} catch (GeneralSecurityException e) {
+		    			Logger.error("Could not initialize SSL Factory", e);
+		    			throw new SZRGWClientException("Could not initialize SSL Factory");
+		    		} catch (PKIException e) {
+		    			Logger.error("Could not initialize SSL Factory", e);
+		    			throw new SZRGWClientException("Could not initialize SSL Factory");
+		    		} 
+		    	}
 		    	Logger.info("Starte Kommunikation mit dem Stammzahlenregister Gateway(" + connectionParameters.getUrl() + ")...");
+		    }
+		    catch (ConfigurationException e) {
+		    	Logger.warn(e);
+		    	Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", null ));
+		    }
 		    
 		    // create request
 		    CreateIdentityLinkResponse response = null;