[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui/graphicImage ...

[Gavin King]

  User: gavin   
  Date: 07/06/10 15:26:00

  Modified:    src/ui/org/jboss/seam/ui/graphicImage 
                        GraphicImageResource.java
  Log:
  major refactor of contexts impl
  JBSEAM-953
  
  Revision  Changes    Path
  1.2       +5 -7      jboss-seam/src/ui/org/jboss/seam/ui/graphicImage/GraphicImageResource.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: GraphicImageResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/graphicImage/GraphicImageResource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- GraphicImageResource.java	3 Apr 2007 18:10:35 -0000	1.1
  +++ GraphicImageResource.java	10 Jun 2007 19:26:00 -0000	1.2
  @@ -10,17 +10,16 @@
   import javax.servlet.ServletOutputStream;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -import javax.servlet.http.HttpSession;
   
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  -import org.jboss.seam.contexts.ContextAdaptor;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.servlet.AbstractResource;
  +import org.jboss.seam.servlet.ServletRequestSessionMap;
   import org.jboss.seam.ui.graphicImage.GraphicImageStore.ImageWrapper;
   
   @Startup
  @@ -49,12 +48,11 @@
                  request.getPathInfo().lastIndexOf("."));
   
         // Set up Seam contexts
  -      HttpSession session = request.getSession(true);
         Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
         Lifecycle.setServletRequest(request);
  -      Lifecycle.beginRequest(getServletContext(), session, request);
  +      Lifecycle.beginRequest( getServletContext(), request );
         Manager.instance().restoreConversation(request.getParameterMap());
  -      Lifecycle.resumeConversation(session);
  +      Lifecycle.resumeConversation(request);
         Manager.instance().handleConversationPropagation(request.getParameterMap());
         
         try
  @@ -75,8 +73,8 @@
            }
   
            // TODO: conversation timeout
  -         Manager.instance().endRequest(ContextAdaptor.getSession(session));
  -         Lifecycle.endRequest(session);
  +         Manager.instance().endRequest( new ServletRequestSessionMap(request) );
  +         Lifecycle.endRequest(request);
         }
         catch (Exception e)
         {