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

[Gavin King]

  User: gavin   
  Date: 06/07/12 16:51:01

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  hide dead conversationId
  
  Revision  Changes    Path
  1.79      +3 -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.78
  retrieving revision 1.79
  diff -u -b -r1.78 -r1.79
  --- Manager.java	12 Jul 2006 20:44:59 -0000	1.78
  +++ Manager.java	12 Jul 2006 20:51:01 -0000	1.79
  @@ -44,7 +44,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.78 $
  + * @version $Revision: 1.79 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -801,7 +801,7 @@
      }
   
      private String encodeConversationId(String url) {
  -      if ( Seam.isSessionInvalid() )
  +      if ( destroyBeforeRedirect || Seam.isSessionInvalid() )
         {
            return url;
         }
  @@ -928,6 +928,7 @@
               !url.contains("?" + getConversationIdParameter() +"=");
         if (appendConversationId)
         {
  +         
            url = encodeConversationId(url);
            beforeRedirect();
         }