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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/pages  
                        ELConversationIdParameter.java
                        SyntheticConversationIdParameter.java
  Log:
  good start on JBSEAM-116 (finally)
  
  Revision  Changes    Path
  1.6       +2 -2      jboss-seam/src/main/org/jboss/seam/pages/ELConversationIdParameter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ELConversationIdParameter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/ELConversationIdParameter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ELConversationIdParameter.java	1 May 2007 16:43:52 -0000	1.5
  +++ ELConversationIdParameter.java	13 Jun 2007 16:43:03 -0000	1.6
  @@ -2,8 +2,8 @@
   
   import java.util.Map;
   
  +import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.Expressions;
  -import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Expressions.ValueExpression;
   import org.jboss.seam.util.Id;
   
  @@ -46,7 +46,7 @@
      
      public String getRequestConversationId(Map parameters)
      {
  -      String value = Manager.getRequestParameterValue(parameters, parameterName);
  +      String value = ConversationPropagation.getRequestParameterValue(parameters, parameterName);
         if (value==null)
         {
            return null;
  
  
  
  1.5       +2 -1      jboss-seam/src/main/org/jboss/seam/pages/SyntheticConversationIdParameter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SyntheticConversationIdParameter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/SyntheticConversationIdParameter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SyntheticConversationIdParameter.java	9 Mar 2007 02:14:15 -0000	1.4
  +++ SyntheticConversationIdParameter.java	13 Jun 2007 16:43:03 -0000	1.5
  @@ -2,6 +2,7 @@
   
   import java.util.Map;
   
  +import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.util.Id;
   
  @@ -34,6 +35,6 @@
      
      public String getRequestConversationId(Map parameters)
      {
  -      return Manager.getRequestParameterValue( parameters, getParameterName() );      
  +      return ConversationPropagation.getRequestParameterValue( parameters, getParameterName() );      
      }
   }