Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java,v
diff -u -r1.12 -r1.13
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	13 Jul 2006 04:33:45 -0000	1.12
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	18 Jul 2006 00:02:12 -0000	1.13
@@ -67,6 +67,7 @@
 	private static List status;
 	
 	public ActionForward edit(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception{
+		initLocalesAndStatus();
 		Integer orgId = WebUtil.readIntParam(request,"orgId",true);
 		if(orgId != null){//editing existing organisation
 			Organisation org = (Organisation)getService().findById(Organisation.class,orgId);
@@ -85,7 +86,6 @@
 			SupportedLocale locale = (SupportedLocale)getService().findByProperties(SupportedLocale.class,properties).get(0);
 			orgForm.set("localeId",locale.getLocaleId());
 		}
-		//request.getSession().setAttribute("countries",countries);
 		request.getSession().setAttribute("locales",locales);
 		request.getSession().setAttribute("status",status);
 		return mapping.findForward("organisation");
@@ -103,11 +103,18 @@
 		if(service==null){
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
 			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+		}
+		return service;
+	}
+	
+	private void initLocalesAndStatus(){
+		if((locales==null)||(status==null)){
+			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
 			locales = service.findAll(SupportedLocale.class);
 			status = service.findAll(OrganisationState.class);
 			Collections.sort(locales);
 		}
-		return service;
 	}
 
 } // end Action