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

[Gavin King]

  User: gavin   
  Date: 07/06/02 21:15:35

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  JBSEAM-1361
  
  Revision  Changes    Path
  1.120     +20 -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.119
  retrieving revision 1.120
  diff -u -b -r1.119 -r1.120
  --- Pages.java	31 May 2007 20:26:57 -0000	1.119
  +++ Pages.java	3 Jun 2007 01:15:35 -0000	1.120
  @@ -29,6 +29,7 @@
   import org.dom4j.Element;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  +import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.FlushModeType;
   import org.jboss.seam.annotations.Install;
  @@ -81,8 +82,9 @@
      private String loginViewId;
      private Map<String, ConversationIdParameter> conversations = Collections.synchronizedMap( new HashMap<String, ConversationIdParameter>() );
      
  -   private Integer httpPort = null;
  -   private Integer httpsPort = null;
  +   private boolean invalidateSessionBeforeSchemeChange = true;   
  +   private Integer httpPort;
  +   private Integer httpsPort;
    
      private SortedSet<String> wildcardViewIds = new TreeSet<String>( 
            new Comparator<String>() {
  @@ -260,6 +262,10 @@
            if ( scheme!=null && !requestScheme.equals(scheme) )
            {
               Manager.instance().redirect(viewId);              
  +            if (invalidateSessionBeforeSchemeChange)
  +            {
  +               Seam.invalidateSession();
  +            }
               return false;
            }
         }
  @@ -1405,4 +1411,14 @@
         this.httpsPort = httpsPort;
      }
      
  +   public boolean isInvalidateSessionBeforeSchemeChange()
  +   {
  +      return invalidateSessionBeforeSchemeChange;
  +   }
  +   
  +   public void setInvalidateSessionBeforeSchemeChange(boolean invalidateSessionBeforeSchemeChange)
  +   {
  +      this.invalidateSessionBeforeSchemeChange = invalidateSessionBeforeSchemeChange;
  +   }
  +   
   }