[jboss-cvs] jboss-seam/src/remoting/org/jboss/seam/remoting ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/06/13 19:42:47

  Modified:    src/remoting/org/jboss/seam/remoting  PollHandler.java
  Log:
  refactored with gavin's changes
  
  Revision  Changes    Path
  1.5       +15 -22    jboss-seam/src/remoting/org/jboss/seam/remoting/PollHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PollHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/remoting/org/jboss/seam/remoting/PollHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PollHandler.java	13 Jun 2007 21:10:14 -0000	1.4
  +++ PollHandler.java	13 Jun 2007 23:42:47 -0000	1.5
  @@ -5,7 +5,6 @@
   import java.util.ArrayList;
   import java.util.List;
   
  -import javax.faces.event.PhaseId;
   import javax.jms.JMSException;
   import javax.jms.Message;
   import javax.jms.ObjectMessage;
  @@ -17,8 +16,7 @@
   import org.dom4j.Document;
   import org.dom4j.Element;
   import org.dom4j.io.SAXReader;
  -import org.jboss.seam.contexts.Lifecycle;
  -import org.jboss.seam.core.ServletContexts;
  +import org.jboss.seam.contexts.ContextualHttpServletRequest;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.remoting.messaging.PollError;
  @@ -60,7 +58,7 @@
       this.servletContext = ctx;
     }
   
  -  public void handle(HttpServletRequest request, HttpServletResponse response)
  +  public void handle(HttpServletRequest request, final HttpServletResponse response)
         throws Exception
     {
       // We're sending an XML response, so set the response content type to text/xml
  @@ -71,14 +69,13 @@
       Document doc = xmlReader.read(request.getInputStream());
       Element env = doc.getRootElement();
   
  -    List<PollRequest> polls = unmarshalRequests(env);
  +    final List<PollRequest> polls = unmarshalRequests(env);
   
  -    try
  +    new ContextualHttpServletRequest(request, servletContext)
  +    {
  +       @Override
  +       public void process() throws Exception
       {
  -      Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
  -      Lifecycle.beginRequest(servletContext, request);
  -      ServletContexts.instance().setRequest(request);
  -
         for (PollRequest req : polls)
         {
           req.poll();
  @@ -87,11 +84,7 @@
         // Package up the response
         marshalResponse(polls, response.getOutputStream());      
       }
  -    finally
  -    {
  -      Lifecycle.endRequest();
  -      Lifecycle.setPhaseId(null);
  -    }
  +    }.run();
     }