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

[Gavin King]

  User: gavin   
  Date: 07/06/13 12:43:04

  Modified:    src/ui/org/jboss/seam/ui/graphicImage 
                        GraphicImageResource.java
  Log:
  good start on JBSEAM-116 (finally)
  
  Revision  Changes    Path
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- GraphicImageResource.java	10 Jun 2007 19:26:00 -0000	1.2
  +++ GraphicImageResource.java	13 Jun 2007 16:43:04 -0000	1.3
  @@ -17,6 +17,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.servlet.AbstractResource;
   import org.jboss.seam.servlet.ServletRequestSessionMap;
  @@ -51,9 +52,10 @@
         Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
         Lifecycle.setServletRequest(request);
         Lifecycle.beginRequest( getServletContext(), request );
  -      Manager.instance().restoreConversation(request.getParameterMap());
  +      ConversationPropagation.instance().restoreConversationId( request.getParameterMap() );
  +      Manager.instance().restoreConversation();
         Lifecycle.resumeConversation(request);
  -      Manager.instance().handleConversationPropagation(request.getParameterMap());
  +      Manager.instance().handleConversationPropagation( request.getParameterMap() );
         
         try
         {