From b5250268a67a571d0cd5563b8820c88c2c4e7cca Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 7 May 2014 10:46:51 +0200
Subject: solve merge problem

---
 .../id/configuration/data/oa/OAAuthenticationData.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'id/ConfigWebTool')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
index ee2f46eb9..cb60a21a0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
@@ -277,10 +277,24 @@ public class OAAuthenticationData implements IOnlineApplicationData {
         
         Mandates mandates = new Mandates();
         if (isUseMandates()) {
-            mandates.setProfiles(getMandateProfiles());
+        	   	
+        	String[] profileList = getMandateProfiles().split(",");
+        	
+        	List<String> dbProfiles = mandates.getProfileName();
+        	if (dbProfiles == null) {
+        		dbProfiles = new ArrayList<String>();
+        		mandates.setProfileName(dbProfiles);
+        		
+        	}        	
+        
+        	for (String el: profileList)
+        		dbProfiles.add(el.trim());
+        		                	
+            mandates.setProfiles(null);
 
         } else {
-            mandates.setProfiles(new String());
+            mandates.setProfiles(null);
+            mandates.getProfileName().clear();
         }
         authoa.setMandates(mandates);
 
-- 
cgit v1.2.3