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

[Gavin King]

  User: gavin   
  Date: 07/06/13 17:10:14

  Modified:    src/pdf/org/jboss/seam/pdf  DocumentStoreServlet.java
  Log:
  refactor
  
  Revision  Changes    Path
  1.11      +13 -33    jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStoreServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentStoreServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStoreServlet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- DocumentStoreServlet.java	13 Jun 2007 16:43:04 -0000	1.10
  +++ DocumentStoreServlet.java	13 Jun 2007 21:10:14 -0000	1.11
  @@ -2,16 +2,12 @@
   
   import java.io.IOException;
   
  -import javax.faces.event.PhaseId;
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
  -import org.jboss.seam.contexts.Lifecycle;
  -import org.jboss.seam.core.ConversationPropagation;
  -import org.jboss.seam.core.Manager;
  -import org.jboss.seam.servlet.ServletRequestSessionMap;
  +import org.jboss.seam.contexts.ContextualHttpServletRequest;
   import org.jboss.seam.util.Parameters;
   
   public class DocumentStoreServlet 
  @@ -20,39 +16,23 @@
       private static final long serialVersionUID = 5196002741557182072L;
   
       @Override
  -    protected void doGet(final HttpServletRequest request, HttpServletResponse response) 
  -        throws ServletException, 
  -               IOException 
  -    {
  -        Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
  -        Lifecycle.setServletRequest(request);
  -        Lifecycle.beginRequest( getServletContext(), request );
  -        ConversationPropagation.instance().restoreConversationId( request.getParameterMap() );
  -        Manager.instance().restoreConversation();
  -        Lifecycle.resumeConversation(request);
  -        Manager.instance().handleConversationPropagation( request.getParameterMap() );
  -        try 
  +    protected void doGet(final HttpServletRequest request, final HttpServletResponse response) 
  +        throws ServletException, IOException 
           {
  -           doWork(request, response);
  -           //TODO: conversation timeout
  -           Manager.instance().endRequest( new ServletRequestSessionMap(request) );
  -           Lifecycle.endRequest(request);
  -        } 
  -        catch (Exception e) 
  +        new ContextualHttpServletRequest( request, getServletContext() )
           {
  -           Lifecycle.endRequest();           
  -           throw new ServletException(e);
  -        } 
  -        finally 
  +            @Override
  +            public void process() throws ServletException, IOException
           {
  -           Lifecycle.setServletRequest(null);
  -           Lifecycle.setPhaseId(null);
  +                 doWork(request, response);
  +               
           }
  +        }.run();
       
       }    
       
       
  -    private void doWork(HttpServletRequest request, HttpServletResponse response) 
  +    private static void doWork(HttpServletRequest request, HttpServletResponse response) 
           throws IOException 
       {
           String contentId = (String)
  @@ -62,7 +42,7 @@
                   
           DocumentStore store = DocumentStore.instance();
           
  -        if (store.idIsValid(contentId)) 
  +        if ( store.idIsValid(contentId )) 
           {
               DocumentData documentData = store.getDocumentData(contentId);