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

[Gavin King]

  User: gavin   
  Date: 07/07/25 15:33:41

  Modified:    src/main/org/jboss/seam/core   ConversationInterceptor.java
                        Manager.java
  Log:
  ws
  
  Revision  Changes    Path
  1.2       +2 -2      jboss-seam/src/main/org/jboss/seam/core/ConversationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ConversationInterceptor.java	25 Jun 2007 23:59:30 -0000	1.1
  +++ ConversationInterceptor.java	25 Jul 2007 19:33:40 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.1 2007/06/25 23:59:30 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.2 2007/07/25 19:33:40 gavin Exp $
   package org.jboss.seam.core;
   
   import java.lang.reflect.Method;
  @@ -214,7 +214,7 @@
         }
         else if (nested)
         {
  -         Manager.instance().beginNestedConversation( );
  +         Manager.instance().beginNestedConversation();
            beginNavigation(pageflowName);
         }
      }
  
  
  
  1.184     +9 -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.183
  retrieving revision 1.184
  diff -u -b -r1.183 -r1.184
  --- Manager.java	25 Jul 2007 17:49:36 -0000	1.183
  +++ Manager.java	25 Jul 2007 19:33:41 -0000	1.184
  @@ -406,7 +406,7 @@
               throw new IllegalStateException("long-running conversation already active");
            }
            beginConversation();
  -         if (propagation.length()>6)
  +         if ( propagation.length()>6 )
            {
               Pageflow.instance().begin( propagation.substring(6) );
            }
  @@ -416,7 +416,7 @@
            if ( !isLongRunningConversation )
            {
               beginConversation();
  -            if (propagation.length()>5)
  +            if ( propagation.length()>5 )
               {
                  Pageflow.instance().begin( propagation.substring(5) );
               }
  @@ -424,13 +424,16 @@
         }
         else if ( propagation!=null && propagation.startsWith("nest") )
         {          
  -         if (isLongRunningOrNestedConversation()) {
  +         if ( isLongRunningOrNestedConversation() ) 
  +         {
                beginNestedConversation();    
  -         } else {
  +         }
  +         else 
  +         {
                beginConversation();
            }
            
  -         if (propagation.length()>5)
  +         if ( propagation.length()>5 )
            {
               Pageflow.instance().begin( propagation.substring(5) );
            }