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

[Gavin King]

  User: gavin   
  Date: 07/06/10 15:25:59

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  major refactor of contexts impl
  JBSEAM-953
  
  Revision  Changes    Path
  1.50      +2 -3      jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- AbstractSeamPhaseListener.java	31 May 2007 20:26:59 -0000	1.49
  +++ AbstractSeamPhaseListener.java	10 Jun 2007 19:25:59 -0000	1.50
  @@ -13,7 +13,6 @@
   
   import org.jboss.seam.Seam;
   import org.jboss.seam.contexts.Context;
  -import org.jboss.seam.contexts.ContextAdaptor;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.ConversationList;
  @@ -210,7 +209,7 @@
         }
         
         ExternalContext externalContext = facesContext.getExternalContext();
  -      Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
  +      Manager.instance().endRequest( externalContext.getSessionMap() );
         Lifecycle.endRequest(externalContext);
      }
      
  @@ -221,7 +220,7 @@
         //Note: we can't call Manager.instance().beforeRedirect() here, 
         //since a redirect is not the only reason for a responseComplete
         ExternalContext externalContext = facesContext.getExternalContext();
  -      Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
  +      Manager.instance().endRequest( externalContext.getSessionMap() );
         Lifecycle.endRequest( facesContext.getExternalContext() );
      }