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

[Gavin King]

  User: gavin   
  Date: 06/11/03 11:49:17

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  need to unlock the conversation stack even after destroying the nested conversation
  
  Revision  Changes    Path
  1.109     +9 -2      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.108
  retrieving revision 1.109
  diff -u -b -r1.108 -r1.109
  --- Manager.java	2 Nov 2006 19:28:14 -0000	1.108
  +++ Manager.java	3 Nov 2006 16:49:17 -0000	1.109
  @@ -43,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.108 $
  + * @version $Revision: 1.109 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -327,7 +327,14 @@
      public void unlockConversation()
      {
         ConversationEntry ce = getCurrentConversationEntry();
  -      if (ce!=null) ce.unlock();
  +      if (ce!=null) 
  +      {
  +         ce.unlock();
  +      }
  +      else if ( isNestedConversation() )
  +      {
  +         ConversationEntries.instance().getConversationEntry( getParentConversationId() ).unlock();
  +      }
      }
   
      private void storeLongRunningConversation(Object response)