[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/aspects/server ...

[Julien Viet]

  User: julien  
  Date: 06/07/13 17:25:44

  Modified:    core/src/main/org/jboss/portal/core/aspects/server 
                        UserInterceptor.java
  Log:
  fixing JBPORTAL-952 : Shuting down JBP generates exception
  comment : strangely doing a JNDI lookup returns null when it should throw NameNotFoundException
  
  Revision  Changes    Path
  1.31      +16 -11    jboss-portal/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UserInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- UserInterceptor.java	9 Jul 2006 00:42:17 -0000	1.30
  +++ UserInterceptor.java	13 Jul 2006 21:25:44 -0000	1.31
  @@ -28,11 +28,9 @@
   import org.jboss.portal.identity.UserModule;
   import org.jboss.portal.identity.User;
   import org.jboss.portal.identity.NoSuchUserException;
  -import org.jboss.portal.identity.IdentityException;
   import org.jboss.logging.Logger;
   
   import javax.naming.InitialContext;
  -import javax.naming.NamingException;
   import javax.naming.NameNotFoundException;
   import javax.servlet.http.HttpSession;
   import javax.servlet.http.HttpServletRequest;
  @@ -50,7 +48,7 @@
    * current value when the user is not used anymore.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.30 $
  + * @version $Revision: 1.31 $
    */
   public class UserInterceptor extends ServerInterceptor
   {
  @@ -231,18 +229,24 @@
            //
            // Here we use JNDI to locate the module as this finalizer could have been
            // migrated in the session of another node of the cluster
  +         UserModule module = null;
            try
            {
  -            UserModule module = (UserModule)new InitialContext().lookup("java:portal/UserModule");
  -
  -            //  Get user and set last visit date to now
  -            User user = module.findUserById(userId);
  -            user.setLastVisitDate(new Date());
  +            module = (UserModule)new InitialContext().lookup("java:portal/UserModule");
            }
            catch (NameNotFoundException ignore)
            {
               // Name is not bound anymore, it could happen during a shutdown, we don't do anything
            }
  +
  +         //  Get user and set last visit date to now if we can
  +         if (module != null)
  +         {
  +            try
  +            {
  +               User user = module.findUserById(userId);
  +               user.setLastVisitDate(new Date());
  +            }
            catch (NoSuchUserException e)
            {
               // User is not found
  @@ -250,4 +254,5 @@
            }
         }
      }
  +   }
   }