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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/06/13 19:23:07

  Modified:    src/remoting/org/jboss/seam/remoting 
                        InterfaceGenerator.java
  Log:
  refactored
  
  Revision  Changes    Path
  1.5       +33 -36    jboss-seam/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterfaceGenerator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- InterfaceGenerator.java	13 Jun 2007 21:10:14 -0000	1.4
  +++ InterfaceGenerator.java	13 Jun 2007 23:23:07 -0000	1.5
  @@ -17,7 +17,6 @@
   import java.util.Map;
   import java.util.Set;
   
  -import javax.faces.event.PhaseId;
   import javax.servlet.ServletContext;
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServletRequest;
  @@ -28,7 +27,7 @@
   import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.WebRemote;
  -import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.contexts.ContextualHttpServletRequest;
   import org.jboss.seam.core.ServletContexts;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  @@ -68,20 +67,21 @@
      * @param response HttpServletResponse
      * @throws Exception
      */
  -  public void handle(HttpServletRequest request, HttpServletResponse response)
  +  public void handle(final HttpServletRequest request, final HttpServletResponse response)
         throws Exception
     {
  -    try
  +     new ContextualHttpServletRequest(request, servletContext)
  +     {
  +        @Override
  +        public void process() throws Exception
       {
  -      Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
  -      Lifecycle.beginRequest(servletContext, request);
         ServletContexts.instance().setRequest(request);
  -
         String[] componentNames = request.getQueryString().split("&");
         Component[] components = new Component[componentNames.length];
         Set<Type> types = new HashSet<Type>();
   
  -      for (int i = 0; i < componentNames.length; i++) {
  +           for (int i = 0; i < componentNames.length; i++) 
  +           {
           components[i] = Component.forName(componentNames[i]);
           if (components[i] == null)
           {
  @@ -100,10 +100,7 @@
   
         generateComponentInterface(components, response.getOutputStream(), types);
       }
  -    finally
  -    {
  -      Lifecycle.setPhaseId(null);
  -    }
  +     }.run();
     }
   
     /**