Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java

1 files changed, 16 insertions, 12 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
index 44c9db380..04ff153d3 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
@@ -28,37 +28,41 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
  */
 public class QAAAttributeSchemaValidator implements Validator<QAAAttribute> {
 
-
 	/**
 	 * Validate action.
 	 * 
-	 * @param qaa the quality authentication assurance level attribute
+	 * @param qaa
+	 *            the quality authentication assurance level attribute
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	public final void validate(final QAAAttribute qaa) throws ValidationException {
 		validateAction(qaa);
 	}
 
-
 	/**
 	 * Validate action.
 	 * 
-	 * @param qaaAttribute the quality authentication assurance level attribute.
+	 * @param qaaAttribute
+	 *            the quality authentication assurance level attribute.
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
-	protected final void validateAction(final QAAAttribute qaaAttribute)
-	throws ValidationException {
+	protected final void validateAction(final QAAAttribute qaaAttribute) throws ValidationException {
 		if (DatatypeHelper.isEmpty(qaaAttribute.getQaaLevel())) {
 			throw new ValidationException("QAALevel label must be specified.");
 		}
-
-		final int qaa = Integer.valueOf(qaaAttribute.getQaaLevel());
+		int qaa = 0;
+		try {
+			qaa = Integer.valueOf(qaaAttribute.getQaaLevel());
+		} catch (Exception e) {
+			throw new ValidationException("QAALevel is not a valid number!");
+		}
 
 		if (qaa < QAAAttribute.MIN_VALUE || qaa > QAAAttribute.MAX_VALUE) {
-			throw new ValidationException(
-					"QAALevel label must be greater than 0.");
+			throw new ValidationException("QAALevel label must be greater than 0.");
 		}
 	}