1 files changed, 36 insertions, 25 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
index f5f265ea6..da3c99714 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts2.interceptor.ServletRequestAware;
@@ -22,6 +23,7 @@ import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.configuration.data.OAListElement;
 import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
+import at.gv.egovernment.moa.id.configuration.helper.FormDataHelper;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -48,8 +50,13 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 	
 	
 	public String listAllOnlineAppliactions() {
+		HttpSession session = request.getSession();
+		if (session == null) {
+			log.info("No http Session found.");
+			return Constants.STRUTS_ERROR;
+		}
 		
-		Object authUserObj = request.getSession().getAttribute(Constants.SESSION_AUTH);
+		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
 		
 		authUser = (AuthenticatedUser) authUserObj;
 		
@@ -65,8 +72,16 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 				dbOAs = authUserDB.getOnlineApplication();
 		}
 					
-		addFormOAs(dbOAs);			
-
+		if (dbOAs == null || dbOAs.size() == 0) {
+			addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA"));
+			
+		} else {
+			formOAs = FormDataHelper.addFormOAs(dbOAs);
+		}
+		
+		session.setAttribute(Constants.SESSION_RETURNAREA, 
+				Constants.STRUTS_RETURNAREA_VALUES.main.name());
+		
 		ConfigurationDBUtils.closeSession();
 		
 		return Constants.STRUTS_SUCCESS;
@@ -86,8 +101,13 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 	}
 	
 	public String searchOA() {
+		HttpSession session = request.getSession();
+		if (session == null) {
+			log.info("No http Session found.");
+			return Constants.STRUTS_ERROR;
+		}
 		
-		Object authUserObj = request.getSession().getAttribute(Constants.SESSION_AUTH);
+		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
 		
 		authUser = (AuthenticatedUser) authUserObj;
 		
@@ -125,32 +145,23 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 			}
 		}
 		
-		addFormOAs(dbOAs);
-		
-		ConfigurationDBUtils.closeSession();
-		
-		return Constants.STRUTS_SUCCESS;	
-	}
-	
-	private void addFormOAs(List<OnlineApplication> dbOAs) {
-		
-		formOAs = new ArrayList<OAListElement>();
 		if (dbOAs == null || dbOAs.size() == 0) {
-			addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA", request));
+			log.debug("No OAs found with Identifier " + friendlyname);
+			addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA"));
 			
 		} else {
-			for (OnlineApplication dboa : dbOAs) {
-				OAListElement listoa = new OAListElement();
-				listoa.setActive(dboa.isIsActive());
-				listoa.setDataBaseID(dboa.getHjid());
-				listoa.setOaFriendlyName(dboa.getFriendlyName());
-				listoa.setOaIdentifier(dboa.getPublicURLPrefix());
-				listoa.setOaType(dboa.getType());
-				formOAs.add(listoa);
-			}
+			
+			formOAs = FormDataHelper.addFormOAs(dbOAs);
+			session.setAttribute(Constants.SESSION_RETURNAREA, 
+					Constants.STRUTS_RETURNAREA_VALUES.main.name());
+			
 		}
-	}
+		
+		ConfigurationDBUtils.closeSession();
 	
+		return Constants.STRUTS_SUCCESS;	
+	}
+		
 	public void setServletResponse(HttpServletResponse arg0) {
 		this.response = arg0;
 	}