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

[Gavin King]

  User: gavin   
  Date: 07/06/13 12:43:03

  Modified:    src/main/org/jboss/seam/web   AuthenticationFilter.java
                        ContextFilter.java
  Log:
  good start on JBSEAM-116 (finally)
  
  Revision  Changes    Path
  1.3       +3 -1      jboss-seam/src/main/org/jboss/seam/web/AuthenticationFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuthenticationFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/AuthenticationFilter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- AuthenticationFilter.java	10 Jun 2007 19:25:59 -0000	1.2
  +++ AuthenticationFilter.java	13 Jun 2007 16:43:03 -0000	1.3
  @@ -26,6 +26,7 @@
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.contexts.SessionContext;
  +import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.log.Log;
   import org.jboss.seam.security.Identity;
  @@ -288,7 +289,8 @@
            Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
            Lifecycle.setServletRequest(request);
            Lifecycle.beginRequest( getServletContext(), request );
  -         Manager.instance().restoreConversation( request.getParameterMap() );
  +         ConversationPropagation.instance().restoreConversationId( request.getParameterMap() );
  +         Manager.instance().restoreConversation();
            Lifecycle.resumeConversation(request);
            Manager.instance().handleConversationPropagation( request.getParameterMap() );   
            identity.authenticate();
  
  
  
  1.7       +3 -1      jboss-seam/src/main/org/jboss/seam/web/ContextFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ContextFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ContextFilter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ContextFilter.java	10 Jun 2007 19:25:59 -0000	1.6
  +++ ContextFilter.java	13 Jun 2007 16:43:03 -0000	1.7
  @@ -20,6 +20,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  @@ -48,7 +49,8 @@
         Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
         Lifecycle.setServletRequest(request);
         Lifecycle.beginRequest(getServletContext(), hsr);
  -      Manager.instance().restoreConversation( request.getParameterMap() );
  +      ConversationPropagation.instance().restoreConversationId( request.getParameterMap() );
  +      Manager.instance().restoreConversation();
         Lifecycle.resumeConversation(hsr);
         Manager.instance().handleConversationPropagation( request.getParameterMap() );
         try