[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 06/11/09 11:18:07

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix JBSEAM-482
  
  Revision  Changes    Path
  1.114     +1 -19     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -b -r1.113 -r1.114
  --- Manager.java	9 Nov 2006 14:17:52 -0000	1.113
  +++ Manager.java	9 Nov 2006 16:18:07 -0000	1.114
  @@ -20,8 +20,6 @@
   import javax.faces.context.ExternalContext;
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseId;
  -import javax.portlet.ActionResponse;
  -import javax.servlet.http.HttpServletResponse;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  @@ -42,7 +40,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.113 $
  + * @version $Revision: 1.114 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -355,22 +353,6 @@
         }
      }
   
  -   /**
  -    * Write out the conversation id as a servlet response header or portlet
  -    * render parameter.
  -    */
  -   private void writeConversationIdToResponse(Object response, String conversationId)
  -   {
  -      if (response instanceof HttpServletResponse)
  -      {
  -         ( (HttpServletResponse) response ).setHeader( getConversationIdParameter(), conversationId );
  -      }
  -      else if (response instanceof ActionResponse)
  -      {
  -         ( (ActionResponse) response ).setRenderParameter( getConversationIdParameter(), conversationId );
  -      }
  -   }  
  -   
      private void removeCurrentConversationAndDestroyNestedContexts(ContextAdaptor session) 
      {
         ConversationEntries.instance().removeConversationEntry( getCurrentConversationId() );