From 496ba9bb6e150ad67c5c628c1c97f30d6da81dfb Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Mon, 10 Aug 2015 16:35:14 +0200
Subject: approved changes

---
 .../stork/peps/auth/commons/AttributeProvidersMap.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java')

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
index 24d93f9bb..c59109092 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
@@ -91,4 +91,22 @@ public class AttributeProvidersMap extends LinkedHashMap<AttributeSource, IPerso
 		}
 		LOG.trace("END\n=======================");
 	}
+
+	public void mergeWith(IAttributeProvidersMap aPMap) {
+		Iterator<AttributeSource> maKeys = aPMap.keyIterator();
+		while (maKeys.hasNext()) {
+			AttributeSource key = maKeys.next();
+			IPersonalAttributeList l2 = aPMap.get(key);
+			if (containsKey(key)) {
+				IPersonalAttributeList l1 = get(key);
+				for (PersonalAttribute pa : l2) {
+					if (!l1.containsKey(pa.getName())) {
+						l1.add(pa);
+					}
+				}
+			} else {
+				put(key, l2);
+			}
+		}
+	}
 }
-- 
cgit v1.2.3