diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-17 11:41:14 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-17 11:41:14 +0200 |
commit | 59dee0f36a25d0c5f19d5d5d5652c3d919956cde (patch) | |
tree | 3c2927f5a4a2511b7c403dd592f64fab079f4919 /id/server/stork2-commons | |
parent | 2a5dc4175eeb29331b1af83b0e03fa965d447533 (diff) | |
parent | b92da70a3071e1dbf910ee38ff4efbe61ecc8be6 (diff) | |
download | moa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.tar.gz moa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.tar.bz2 moa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.zip |
Merge first STORK 2 changes
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
pom.xml
Diffstat (limited to 'id/server/stork2-commons')
-rw-r--r-- | id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java index 5d8281445..15803fb68 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java @@ -69,7 +69,7 @@ public final class PersonalAttribute implements Serializable, Cloneable { /** * Is the personal attribute mandatory? */ - private transient boolean required; + private boolean required; /** * Returned status of the attribute from the IdP. |