[Amavisadmin-svn] SF.net SVN: amavisadmin: [24] amavisadmin/trunk/src/java/de/sreindl/ amavisadmin

[<str...@us...>]

Revision: 24
          http://amavisadmin.svn.sourceforge.net/amavisadmin/?rev=24&view=rev
Author:   streindl
Date:     2007-01-18 09:53:20 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Fix for bug #1638069

Modified Paths:
--------------
    amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditUser.java
    amavisadmin/trunk/src/java/de/sreindl/amavisadmin/UserManagement.java

Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditUser.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditUser.java	2007-01-17 21:21:14 UTC (rev 23)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditUser.java	2007-01-18 17:53:20 UTC (rev 24)
@@ -27,7 +27,6 @@
 import com.sun.rave.web.ui.component.Label;
 import com.sun.rave.web.ui.component.Link;
 import com.sun.rave.web.ui.component.Listbox;
-import com.sun.rave.web.ui.component.MessageGroup;
 import com.sun.rave.web.ui.component.Page;
 import com.sun.rave.web.ui.component.PanelGroup;
 import com.sun.rave.web.ui.component.StaticText;
@@ -532,14 +531,12 @@
      */
     public void prerender() {
         log("Prerender Called");
-        ArrayList<Option> lst = null;
+        // #1638069
+        ArrayList<Option> lst = (ArrayList<Option>)getSessionBean1().getParameter(EMAIL_LIST);
         if (user == null) {
             erase();
             fldUserId.setText("unset");
-            lst = new ArrayList<Option>();
-            getSessionBean1().setParameter(EMAIL_LIST, lst);
         } else {
-            lst = (ArrayList<Option>)getSessionBean1().getParameter(EMAIL_LIST);
             fldUserId.setText(user.getId().toString());
             fldUserName.setText(user.getUsername());
             fldFullName.setText(user.getFullname());
@@ -669,7 +666,8 @@
         // mark as new by setting the domain to NULL
         newOptions[options.length] = new Option(new MailAddress(mailAddress, null), mailAddress);
         lstEmailDefaultOptions.setOptions(newOptions);
-        ((ArrayList<Option>)getSessionBean1().getParameter(EMAIL_LIST)).add(newOptions[options.length]);
+        ArrayList<Option> lst = (ArrayList<Option>)getSessionBean1().getParameter(EMAIL_LIST);
+        lst.add(newOptions[options.length]);
         return null;
     }
     
@@ -677,10 +675,10 @@
     private Map deleteMap;
     
     /** Session key for @see deleteMap */
-    private static final String DELETE_MAIL_MAP = "editUser.DELETE_MAIL_MAP";
+    public static final String DELETE_MAIL_MAP = "editUser.DELETE_MAIL_MAP";
     
     /** Session key for email list */
-    private static final String EMAIL_LIST = "editUser.EMAIL_LIST";
+    public static final String EMAIL_LIST = "editUser.EMAIL_LIST";
     
     /**
      * Remove email address from user's email addresses

Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/UserManagement.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/UserManagement.java	2007-01-17 21:21:14 UTC (rev 23)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/UserManagement.java	2007-01-18 17:53:20 UTC (rev 24)
@@ -454,6 +454,8 @@
 
     public String btnAdd_action() {
         getSessionBean1().setParameter(SessionBean1.PARAM_USER_ID, null);
+        // #1638069
+        getSessionBean1().setParameter(EditUser.EMAIL_LIST, null);
         return "editSingleUser";
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.