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

[Gavin King]

  User: gavin   
  Date: 07/06/20 04:23:17

  Modified:    src/main/org/jboss/seam/interceptors 
                        WebServiceInterceptor.java
  Log:
  split up Lifecycle, much better
  
  Revision  Changes    Path
  1.9       +19 -25    jboss-seam/src/main/org/jboss/seam/interceptors/WebServiceInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebServiceInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/WebServiceInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- WebServiceInterceptor.java	20 Jun 2007 01:10:10 -0000	1.8
  +++ WebServiceInterceptor.java	20 Jun 2007 08:23:17 -0000	1.9
  @@ -12,6 +12,7 @@
   import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.contexts.ServletLifecycle;
   import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.core.Manager;
  @@ -35,8 +36,6 @@
      {
         if (Contexts.isEventContextActive() && Contexts.getEventContext().isSet(SeamWSRequestHandler.MESSAGE_CONTEXT))
         {
  -         try
  -         {
               MessageContext messageContext = (MessageContext) Contexts.getEventContext().get(
                        SeamWSRequestHandler.MESSAGE_CONTEXT);
               HttpServletRequest request = (HttpServletRequest) messageContext.get(
  @@ -46,7 +45,7 @@
               ConversationPropagation.instance().setConversationId( extractConversationId(invocation) );
               
               Manager.instance().restoreConversation();
  -            Lifecycle.resumeConversation(request);    
  +         ServletLifecycle.resumeConversation(request);    
               
               Object result = invocation.proceed();
               
  @@ -56,11 +55,6 @@
               
               return result;
            }
  -         finally
  -         {
  -            Lifecycle.setPhaseId(null);         
  -         }
  -      }
         else
         {
            return invocation.proceed();