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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/interceptors 
                        WebServiceInterceptor.java
  Log:
  major refactor of contexts impl
  JBSEAM-953
  
  Revision  Changes    Path
  1.2       +3 -3      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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- WebServiceInterceptor.java	7 Jun 2007 11:34:11 -0000	1.1
  +++ WebServiceInterceptor.java	10 Jun 2007 19:25:58 -0000	1.2
  @@ -10,12 +10,12 @@
   import org.jboss.seam.annotations.Conversation;
   import org.jboss.seam.annotations.ConversationId;
   import org.jboss.seam.annotations.Interceptor;
  -import org.jboss.seam.contexts.ContextAdaptor;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.intercept.InvocationContext;
  +import org.jboss.seam.servlet.ServletRequestSessionMap;
   import org.jboss.seam.ws.SeamWSRequestHandler;
   
   /**
  @@ -41,11 +41,11 @@
            String conversationId = extractConversationId(invocation);
            
            Manager.instance().restoreConversation(conversationId);
  -         Lifecycle.resumeConversation(request.getSession());    
  +         Lifecycle.resumeConversation(request);    
            
            Object result = invocation.proceed();
            
  -         Manager.instance().endRequest( ContextAdaptor.getSession(request.getSession()) );
  +         Manager.instance().endRequest( new ServletRequestSessionMap(request) );
            Lifecycle.endRequest();        
            
            return result;