1 files changed, 6 insertions, 5 deletions
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index a79cba4d7..5f4ec2d29 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -40,6 +40,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
 import at.gv.egovernment.moa.id.auth.data.ExtendedSAMLAttribute;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;
+import at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult;
 import at.gv.egovernment.moa.id.auth.data.InfoboxValidatorParams;
 import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
 import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
@@ -589,25 +590,25 @@ public class AuthenticationServer implements MOAIDAuthConstants {
                 InfoboxValidatorParamsBuilder.buildInfoboxValidatorParams(
                   session, verifyInfoboxParameter, infoboxTokenList, hideStammzahl);
               // now validate the infobox
-              boolean infoboxValid = false;
+              InfoboxValidationResult infoboxValidationResult = null;
               try {
-                infoboxValid = infoboxValidator.validate(infoboxValidatorParams);
+                infoboxValidationResult = infoboxValidator.validate(infoboxValidatorParams);
               } catch (ValidateException e) {
                 Logger.error("Error validating "  + identifier + " infobox:" + e.getMessage());
                 throw new ValidateException(
                   "validator.44", new Object[] {friendlyName});
               }
-              if (!infoboxValid) {
+              if (!infoboxValidationResult.isValid()) {
                 Logger.info("Validation of "  + identifier + " infobox failed.");
                 throw new ValidateException(
-                  "validator.40", new Object[] {friendlyName, infoboxValidator.getErrorMessage()});
+                  "validator.40", new Object[] {friendlyName, infoboxValidationResult.getErrorMessage()});
               }
               
               Logger.info(identifier + " infobox successfully validated.");
               
               // get the SAML attributes to be appended to the AUTHBlock or to the final
               // SAML Assertion            
-              ExtendedSAMLAttribute[] extendedSAMLAttributes = infoboxValidator.getExtendedSamlAttributes();
+              ExtendedSAMLAttribute[] extendedSAMLAttributes = infoboxValidationResult.getExtendedSamlAttributes();
               if (extendedSAMLAttributes != null) {
                 int length = extendedSAMLAttributes.length; 
                 for (int i=0; i<length; i++) {