diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 12:07:52 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 12:07:52 +0200 |
commit | 1051a42329a603821f415383343d253724d4cd65 (patch) | |
tree | f8a0b6e8445b7034dfe38d6ba3a61f1429a75a6e /id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java | |
parent | bb1b12ac5b240629e16ea1c7a50891e99f4adc14 (diff) | |
parent | eb0cf88708f3d689c2cb6bb0dbf83dd290bee887 (diff) | |
download | moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.gz moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.bz2 moa-id-spss-1051a42329a603821f415383343d253724d4cd65.zip |
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
Diffstat (limited to 'id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java')
-rw-r--r-- | id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java index ac46f73e4..cc3bf3676 100644 --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java @@ -22,36 +22,39 @@ package eu.stork.peps.exceptions; */ public class SAMLEngineException extends Exception { - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 2611361164977849837L; + /** The Constant serialVersionUID. */ + private static final long serialVersionUID = 2611361164977849837L; - /** - * Instantiates a new SAMLEngine exception. - * - * @param wrappedException the wrapped exception - */ - public SAMLEngineException(final Exception wrappedException) { - super(wrappedException); - } + /** + * Instantiates a new SAMLEngine exception. + * + * @param wrappedException + * the wrapped exception + */ + public SAMLEngineException(final Exception wrappedException) { + super(wrappedException); + } - /** - * Instantiates a new SAMLEngine exception. - * - * @param message the message - */ - public SAMLEngineException(final String message) { - super(message); - } + /** + * Instantiates a new SAMLEngine exception. + * + * @param message + * the message + */ + public SAMLEngineException(final String message) { + super(message); + } - /** - * Instantiates a new SAMLEngine exception. - * - * @param message the message - * @param wrappedException the wrapped exception - */ - public SAMLEngineException(final String message, - final Exception wrappedException) { - super(message, wrappedException); - } + /** + * Instantiates a new SAMLEngine exception. + * + * @param message + * the message + * @param wrappedException + * the wrapped exception + */ + public SAMLEngineException(final String message, final Exception wrappedException) { + super(message, wrappedException); + } } |