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

[Gavin King]

  User: gavin   
  Date: 06/11/10 21:22:29

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  fix JBSEAM-489
  
  Revision  Changes    Path
  1.65      +5 -2      jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -b -r1.64 -r1.65
  --- Lifecycle.java	4 Nov 2006 01:00:14 -0000	1.64
  +++ Lifecycle.java	11 Nov 2006 02:22:29 -0000	1.65
  @@ -31,7 +31,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.64 $
  + * @version $Revision: 1.65 $
    */
   public class Lifecycle
   {
  @@ -217,7 +217,10 @@
         log.debug("destroying conversation contexts: " + conversationIds);
         for (String conversationId: conversationIds)
         {
  -         Contexts.destroy( new ServerConversationContext(session, conversationId) );
  +         ServerConversationContext conversationContext = new ServerConversationContext(session, conversationId);
  +         Contexts.conversationContext.set(conversationContext);
  +         Contexts.destroy(conversationContext);
  +         Contexts.conversationContext.set(null);
         }
   
         log.debug("destroying session context");