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

[Norman Richards]

  User: nrichards
  Date: 07/07/25 13:49:36

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  JBSEAM-1609
  
  Revision  Changes    Path
  1.183     +11 -6     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.182
  retrieving revision 1.183
  diff -u -b -r1.182 -r1.183
  --- Manager.java	21 Jul 2007 05:41:36 -0000	1.182
  +++ Manager.java	25 Jul 2007 17:49:36 -0000	1.183
  @@ -397,7 +397,6 @@
       */
      public void handleConversationPropagation(Map parameters)
      {
  -      
         String propagation = ConversationPropagation.instance().getPropagationType();
         
         if ( propagation!=null && propagation.startsWith("begin") )
  @@ -425,7 +424,12 @@
         }
         else if ( propagation!=null && propagation.startsWith("nest") )
         {
  +         if (isLongRunningOrNestedConversation()) {
            beginNestedConversation();
  +         } else {
  +             beginConversation();
  +         }
  +         
            if (propagation.length()>5)
            {
               Pageflow.instance().begin( propagation.substring(5) );
  @@ -559,6 +563,7 @@
         {
            throw new IllegalStateException("No long-running conversation active");
         }
  +
         String id = Id.nextId();
         setCurrentConversationId(id);
         createCurrentConversationIdStack(id).addAll(oldStack);