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

[Norman Richards]

  User: nrichards
  Date: 07/07/06 17:16:19

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  JBSEAM-1615
  
  Revision  Changes    Path
  1.179     +10 -0     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.178
  retrieving revision 1.179
  diff -u -b -r1.178 -r1.179
  --- Manager.java	20 Jun 2007 22:11:30 -0000	1.178
  +++ Manager.java	6 Jul 2007 21:16:19 -0000	1.179
  @@ -100,11 +100,21 @@
         Contexts.getConversationContext().flush();
         
         ConversationEntry ce = ConversationEntries.instance().updateConversationId(currentConversationId, id);
  +      String priorId = currentConversationId;
         setCurrentConversationId(id);
  +      
         if (ce!=null)
         {
            setCurrentConversationIdStack( ce.getConversationIdStack() );
            //TODO: what about child conversations?!
  +      } else {
  +          // when ce is null, the id stack will be left with a reference to
  +          // the old conversation id, so we need patch that up
  +          int pos = currentConversationIdStack.indexOf(priorId);
  +          if (pos != -1) {
  +              currentConversationIdStack.set(pos, id);
  +          }
  +          
         }
         
         for (int i=0; i<names.length; i++)