svn commit: r559843 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java

[snoopdave]

Author: snoopdave
Date: Thu Jul 26 08:03:41 2007
New Revision: 559843

URL: http://svn.apache.org/viewvc?view=rev&rev=559843
Log:
Fix for ROL-1493  NPE occurs when select to edit a disable user

Modified:
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?view=diff&rev=559843&r1=559842&r2=559843
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
 Thu Jul 26 08:03:41 2007
@@ -69,7 +69,10 @@
         if(getUserName() != null) {
             try {
                 UserManager mgr = 
WebloggerFactory.getWeblogger().getUserManager();
-                setUser(mgr.getUserByUserName(getUserName()));
+                
+                // use enabled = 'null' to get both enabled and disabled users
+                setUser(mgr.getUserByUserName(getUserName(), null));
+                
             } catch(Exception e) {
                 log.error("Error looking up user - "+getUserName(), e);
             }