update SAML1 error messages if no OA is found

1 files changed, 6 insertions, 5 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
index 9c8c52e87..8f7f17e2e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
@@ -33,6 +33,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
+import at.gv.egovernment.moa.id.auth.exception.InvalidProtocolRequestException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.ProtocolNotActiveException;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;
@@ -102,7 +103,7 @@ public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants {
 		
 		if (!AuthConfigurationProvider.getInstance().getAllowedProtocols().isSAML1Active()) {
 			Logger.info("SAML1 is deaktivated!");
-			throw new ProtocolNotActiveException("auth.22", new Object[] { NAME });
+			throw new ProtocolNotActiveException("auth.22", new Object[] { "SAML 1" });
 			
 		}
 			
@@ -145,14 +146,14 @@ public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants {
 				.getOnlineApplicationParameter(oaURL);
 		
 		if (oaParam == null)
-			throw new AuthenticationException("auth.00",
-					new Object[] { oaURL });
+			throw new InvalidProtocolRequestException("auth.00",
+					new Object[] { null });
 				
 		OASAML1 saml1 = oaParam.getSAML1Parameter();
 		if (saml1 == null || !(saml1.isIsActive() != null && saml1.isIsActive()) ) {
 			Logger.info("Online-Application " + oaURL + " can not use SAML1 for authentication.");
-			throw new AuthenticationException("auth.00",
-					new Object[] { oaURL });
+			throw new InvalidProtocolRequestException("auth.00",
+					new Object[] { null });
 		}
 		
 		config.setSourceID(sourceID);