fix some problems with logging and error codes

3 files changed, 28 insertions, 13 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
index 2cb62b993..bca080ba6 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
@@ -203,12 +203,15 @@ public class PVP2XProtocol extends AbstractAuthProtocolModulController  {
 			String samlRequest = req.getParameter("SAMLRequest");			
 			Logger.warn("Receive INVALID protocol request: " + samlRequest, e);
 			throw new InvalidProtocolRequestException("pvp2.22", new Object[] {e.getMessage()});
+		
+		} catch (MOAIDException e) {
+			throw e;
 			
 		} catch (Throwable e) {			
 			String samlRequest = req.getParameter("SAMLRequest");			
 			Logger.warn("Receive INVALID protocol request: " + samlRequest, e);
 						
-			throw new MOAIDException(e.getMessage(), new Object[] {});
+			throw new MOAIDException("pvp2.24", new Object[] {e.getMessage()});
 		}					
 	}
 	
@@ -254,11 +257,14 @@ public class PVP2XProtocol extends AbstractAuthProtocolModulController  {
 			Logger.warn("Receive INVALID protocol request: " + samlRequest, e);
 			throw new InvalidProtocolRequestException("pvp2.22", new Object[] {e.getMessage()});
 			
+		} catch (MOAIDException e) {
+			throw e;
+						
 		} catch (Throwable e) {			
 			String samlRequest = req.getParameter("SAMLRequest");			
 			Logger.warn("Receive INVALID protocol request: " + samlRequest, e);
 						
-			throw new MOAIDException(e.getMessage(), new Object[] {});
+			throw new MOAIDException("pvp2.24", new Object[] {e.getMessage()});
 		}					
 	}
 	
@@ -304,12 +310,15 @@ public class PVP2XProtocol extends AbstractAuthProtocolModulController  {
 			String samlRequest = req.getParameter("SAMLRequest");			
 			Logger.warn("Receive INVALID protocol request: " + samlRequest, e);
 			throw new InvalidProtocolRequestException("pvp2.22", new Object[] {e.getMessage()});
-			
+		
+		} catch (MOAIDException e) {
+			throw e;
+						
 		} catch (Throwable e) {			
 			String samlRequest = req.getParameter("SAMLRequest");			
 			Logger.warn("Receive INVALID protocol request: " + samlRequest, e);
 						
-			throw new MOAIDException(e.getMessage(), new Object[] {});
+			throw new MOAIDException("pvp2.24", new Object[] {e.getMessage()});
 		}					
 	}
 	
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
index 4c9a1e59f..bf4cfd480 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/AbstractCredentialProvider.java
@@ -121,15 +121,15 @@ public abstract class AbstractCredentialProvider {
 			credentials.setUsageType(UsageType.SIGNING);
 			if (credentials.getPrivateKey() == null && credentials.getSecretKey() == null) {
 				Logger.error(getFriendlyName() + " Metadata Signing credentials is not found or contains no PrivateKey.");
-				throw new CredentialsNotAvailableException(getFriendlyName() + " Assertion Signing credentials (Alias: "
-						+ getMetadataKeyAlias() + ") is not found or contains no PrivateKey.", null);
+				throw new CredentialsNotAvailableException("config.27", new Object[]{getFriendlyName() + " Assertion Signing credentials (Alias: "
+						+ getMetadataKeyAlias() + ") is not found or contains no PrivateKey."});
 				
 			}
 			return credentials;
 		} catch (Exception e) {
 			Logger.error("Failed to generate " + getFriendlyName() + " Metadata Signing credentials");
 			e.printStackTrace();
-			throw new CredentialsNotAvailableException(e.getMessage(), null);
+			throw new CredentialsNotAvailableException("config.27", new Object[]{e.getMessage()}, e);
 		}
 	}
 
@@ -146,8 +146,8 @@ public abstract class AbstractCredentialProvider {
 			credentials.setUsageType(UsageType.SIGNING);
 			if (credentials.getPrivateKey() == null && credentials.getSecretKey() == null) {
 				Logger.error(getFriendlyName() + " Assertion Signing credentials is not found or contains no PrivateKey.");
-				throw new CredentialsNotAvailableException(getFriendlyName() + " Assertion Signing credentials (Alias: "
-						+ getSignatureKeyAlias() + ") is not found or contains no PrivateKey.", null);
+				throw new CredentialsNotAvailableException("config.27", new Object[]{getFriendlyName() + " Assertion Signing credentials (Alias: "
+						+ getSignatureKeyAlias() + ") is not found or contains no PrivateKey."});
 				
 			}
 			
@@ -155,7 +155,7 @@ public abstract class AbstractCredentialProvider {
 		} catch (Exception e) {
 			Logger.error("Failed to generate " + getFriendlyName() + " Assertion Signing credentials");
 			e.printStackTrace();
-			throw new CredentialsNotAvailableException(e.getMessage(), null);
+			throw new CredentialsNotAvailableException("config.27", new Object[]{e.getMessage()}, e);
 		}
 	}
 	
@@ -177,16 +177,17 @@ public abstract class AbstractCredentialProvider {
 			
 			if (credentials.getPrivateKey() == null && credentials.getSecretKey() == null) {
 				Logger.error(getFriendlyName() + " Assertion Encryption credentials is not found or contains no PrivateKey.");
-				throw new CredentialsNotAvailableException(getFriendlyName() + " Assertion Encryption credentials (Alias: "
-						+ getEncryptionKeyAlias() + ") is not found or contains no PrivateKey.", null);
+				throw new CredentialsNotAvailableException("config.27", new Object[]{getFriendlyName() + " Assertion Encryption credentials (Alias: "
+						+ getEncryptionKeyAlias() + ") is not found or contains no PrivateKey."});
 				
 			}
 			
 			return (X509Credential) credentials;
+			
 		} catch (Exception e) {
 			Logger.error("Failed to generate " + getFriendlyName() + " Assertion Encryption credentials");
 			e.printStackTrace();
-			throw new CredentialsNotAvailableException(e.getMessage(), null);
+			throw new CredentialsNotAvailableException("config.27", new Object[]{e.getMessage()}, e);
 		}
 	}
 	
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialsNotAvailableException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialsNotAvailableException.java
index 1e1c37621..85de666c9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialsNotAvailableException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialsNotAvailableException.java
@@ -31,6 +31,11 @@ public class CredentialsNotAvailableException extends MOAIDException {
 		super(messageId, parameters);
 	}
 
+	public CredentialsNotAvailableException(String messageId,
+			Object[] parameters, Throwable e) {
+		super(messageId, parameters, e);
+	}
+	
 	/**
 	 * 
 	 */