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

[Gavin King]

  User: gavin   
  Date: 07/06/10 16:18:34

  Modified:    src/main/org/jboss/seam/core   Manager.java Pages.java
  Log:
  various minor
  
  Revision  Changes    Path
  1.168     +3 -3      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.167
  retrieving revision 1.168
  diff -u -b -r1.167 -r1.168
  --- Manager.java	10 Jun 2007 19:25:58 -0000	1.167
  +++ Manager.java	10 Jun 2007 20:18:34 -0000	1.168
  @@ -43,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.167 $
  + * @version $Revision: 1.168 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -447,11 +447,11 @@
         }
         
         //Next, try to get the conversation id from the globally defined request parameters
  -      if (storedConversationId==null)
  +      if ( isMissing(storedConversationId) )
         {
            storedConversationId = getRequestParameterValue(parameters, conversationIdParameter);
         }
  -      if (storedParentConversationId==null)
  +      if ( isMissing(storedParentConversationId) )
         {
            storedParentConversationId = getRequestParameterValue(parameters, parentConversationIdParameter);
         }
  
  
  
  1.128     +4 -4      jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -b -r1.127 -r1.128
  --- Pages.java	6 Jun 2007 00:37:26 -0000	1.127
  +++ Pages.java	10 Jun 2007 20:18:34 -0000	1.128
  @@ -360,14 +360,14 @@
         String viewId = getViewId(facesContext);      
         for ( Page page: getPageStack(viewId) )
         {         
  -         if ( isNoConversationRedirectRequired(page) )
  +         if ( isLoginRedirectRequired(viewId, page) )
            {
  -            redirectToNoConversationView();
  +            redirectToLoginView();
               return;
            }
  -         else if ( isLoginRedirectRequired(viewId, page) )
  +         else if ( isNoConversationRedirectRequired(page) )
            {
  -            redirectToLoginView();
  +            redirectToNoConversationView();
               return;
            }
            else