aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork2-commons/src/main
diff options
context:
space:
mode:
authorFlorian Reimair <florian.reimair@iaik.tugraz.at>2015-08-11 13:26:30 +0200
committerFlorian Reimair <florian.reimair@iaik.tugraz.at>2015-08-11 13:26:30 +0200
commit9f2beccee247fb30235aeae28ecb91789e39cbe3 (patch)
treedf3fd8754e9b4c2635dd6fb5006506a71c4ad8b8 /id/server/stork2-commons/src/main
parent7696a5956a8d28a0015ef028ac0225fbaddf6c4d (diff)
downloadmoa-id-spss-9f2beccee247fb30235aeae28ecb91789e39cbe3.tar.gz
moa-id-spss-9f2beccee247fb30235aeae28ecb91789e39cbe3.tar.bz2
moa-id-spss-9f2beccee247fb30235aeae28ecb91789e39cbe3.zip
approved some more changes
Diffstat (limited to 'id/server/stork2-commons/src/main')
-rw-r--r--id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java5
-rw-r--r--id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java18
2 files changed, 11 insertions, 12 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
index 87ab4275f..f326ccfe9 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
@@ -251,10 +251,9 @@ public final class Linker implements Serializable {
originalAssertions = new ArrayList<STORKAttrQueryResponse>();
// Gather all assertions
- for (STORKAttrQueryResponse element : this.assertions.values()) {
- originalAssertions.add(element);
+ for (List<STORKAttrQueryResponse> element : this.assertions.values()) {
+ originalAssertions.addAll(element);
}
-
return originalAssertions;
}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
index 82ec6d3b4..c656f81ee 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
@@ -376,15 +376,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
- *
- */
- @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
- public JAXBElement<MandateType> createMandate(MandateType value) {
- return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
- }
-
- /**
* Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}
*
*/
@@ -394,6 +385,15 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
+ *
+ */
+ @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
+ public JAXBElement<MandateType> createMandate(MandateType value) {
+ return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
+ }
+
+ /**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
*
*/