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/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.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/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java')
| -rw-r--r-- | id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java index 113214712..7e1b6bbe2 100644 --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java @@ -28,20 +28,21 @@ import eu.stork.peps.auth.engine.core.AuthenticationAttributes; * * @author fjquevedo */ -public class AuthenticationAttributesUnmarshaller extends -AbstractSAMLObjectUnmarshaller { +public class AuthenticationAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller { /** * Process child element. * - * @param parentObject the parent object - * @param childObject the child object + * @param parentObject + * the parent object + * @param childObject + * the child object * - * @throws UnmarshallingException the unmarshalling exception + * @throws UnmarshallingException + * the unmarshalling exception * */ - protected final void processChildElement(final XMLObject parentObject, - final XMLObject childObject) throws UnmarshallingException { + protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException { final AuthenticationAttributes attrStatement = (AuthenticationAttributes) parentObject; if (childObject instanceof VIDPAuthenticationAttributes) { |