[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 06/10/12 20:39:42

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  lock ce before timing out
  
  Revision  Changes    Path
  1.93      +7 -4      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -b -r1.92 -r1.93
  --- Manager.java	11 Oct 2006 04:42:12 -0000	1.92
  +++ Manager.java	13 Oct 2006 00:39:42 -0000	1.93
  @@ -41,7 +41,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.92 $
  + * @version $Revision: 1.93 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -251,12 +251,15 @@
            long delta = currentTime - conversationEntry.getLastRequestTime();
            if ( delta > conversationEntry.getTimeout() )
            {
  +            if ( conversationEntry.lock() ) //no need to release it...
  +            {
               log.debug("conversation timeout for conversation: " + conversationEntry.getId());
               ContextAdaptor session = ContextAdaptor.getSession(externalContext, true);
               destroyConversation( conversationEntry.getId(), session );
            }
         }
      }
  +   }
   
      /**
       * Clean up all state associated with a conversation