Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserBean.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserBean.java,v
diff -u -r1.1 -r1.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserBean.java	26 Jul 2006 08:06:23 -0000	1.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserBean.java	26 Jul 2006 23:32:13 -0000	1.2
@@ -24,19 +24,17 @@
 /* $Id$ */
 package org.lamsfoundation.lams.admin.web;
 
-import org.apache.struts.action.ActionForm;
-
 /**
  * @author jliew
  * 
  * Bean used as member of UserOrgRoleForm, representing a user's roles.
  *
  */
-public class UserBean extends ActionForm {
+public class UserBean {
 
     private Integer userId;
     private String login;
-    private String[] roleIds;
+    private String[] roleIds = {};
     
     public Integer getUserId() {
     	return this.userId;
@@ -62,11 +60,4 @@
     	this.roleIds = roleIds;
     }
     
-    public Object getRoleId(int key) {
-    	return roleIds[key];
-    }
-    
-    public void setRoleId(int key, String roleId) {
-    	roleIds[key] = roleId;
-    }
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java,v
diff -u -r1.1 -r1.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java	26 Jul 2006 08:06:23 -0000	1.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java	26 Jul 2006 23:32:13 -0000	1.2
@@ -62,7 +62,7 @@
  * 
  * @struts:action path="/userorgrole"
  *                name="UserOrgRoleForm"
- *                scope="request"
+ *                scope="session"
  *                validate="false"
  *
  * @struts:action-forward name="userorgrole"
@@ -91,7 +91,7 @@
 			UserBean userBean = new UserBean();
 			User user = ((UserOrganisation)userOrgs.get(i)).getUser();
 			BeanUtils.copyProperties(userBean,user);
-			userOrgRoleForm.setBean(i,userBean);
+			userOrgRoleForm.addUserBean(userBean);
 		}
 		log.debug("userBeans.size: "+userOrgRoleForm.getUserBeans().size());
 		userOrgRoleForm.setOrgId((Integer)request.getAttribute("orgId"));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleForm.java,v
diff -u -r1.1 -r1.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleForm.java	26 Jul 2006 08:06:23 -0000	1.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleForm.java	26 Jul 2006 23:32:13 -0000	1.2
@@ -34,19 +34,25 @@
  * This is the Action Form that is used when a user has added users
  * to an organisation via UserOrgForm.  Used to record roles for each
  * of the added users.
- *
+ * 
  */
+
+/**
+ * struts doclet
+ * 
+ * @struts.form name="UserOrgRoleForm"
+ */
 public class UserOrgRoleForm extends ActionForm {
 
-	private static ArrayList userBeans;
+	private ArrayList userBeans = new ArrayList();
 	private Integer orgId;
 
 	public ArrayList getUserBeans() {
 		return userBeans;
 	}
 	
 	public void setUserBeans(ArrayList userBeans) {
-		UserOrgRoleForm.userBeans = userBeans;
+		this.userBeans = userBeans;
 	}
 	
 	public Integer getOrgId() {
@@ -56,19 +62,10 @@
 	public void setOrgId(Integer orgId) {
 		this.orgId = orgId;
 	}
-	
-	public Object getBean(int key) {
-    	return userBeans.get(key);
-    }
-    
-    public void setBean(int key, Object bean) {
-    	if(userBeans==null) userBeans = new ArrayList();
-    	if(userBeans.size()<=key) {
-    		userBeans.add(bean);
-    	}else{
-    		userBeans.set(key, bean);
-    	}
-    }
 
+	public void addUserBean(UserBean userBean) {
+		userBeans.add(userBean);
+	}
+
 }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java,v
diff -u -r1.1 -r1.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java	26 Jul 2006 08:06:23 -0000	1.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java	26 Jul 2006 23:32:13 -0000	1.2
@@ -62,7 +62,7 @@
  * @struts:action path="/userorgrolesave"
  *                name="UserOrgRoleForm"
  *                input=".userorgrole"
- *                scope="request"
+ *                scope="session"
  *                validate="false"
  *
  * @struts:action-forward name="userlist"
@@ -79,6 +79,7 @@
             HttpServletResponse response) throws Exception {
 		UserOrgRoleForm userOrgRoleForm = (UserOrgRoleForm)form;
 		ArrayList userBeans = userOrgRoleForm.getUserBeans();
+		log.debug("userBeans is null?"+userBeans==null);
 		Integer orgId = (Integer)userOrgRoleForm.getOrgId();
 		request.setAttribute("org",orgId);