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

[Gavin King]

  User: gavin   
  Date: 06/12/19 12:22:11

  Modified:    src/ui/org/jboss/seam/ui   HtmlButton.java HtmlLink.java
  Log:
  fix   JBSEAM-612
  
  Revision  Changes    Path
  1.6       +3 -2      jboss-seam/src/ui/org/jboss/seam/ui/HtmlButton.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HtmlButton.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlButton.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- HtmlButton.java	18 Dec 2006 22:48:31 -0000	1.5
  +++ HtmlButton.java	19 Dec 2006 17:22:11 -0000	1.6
  @@ -139,10 +139,11 @@
         
         if ( "default".equals(propagation) || "join".equals(propagation) || "nest".equals(propagation) || "end".equals(propagation) )
         {
  -         if ( Conversation.instance().isLongRunning() || Conversation.instance().isNested() )
  -         {
  +         //always add the id, since conversations could begin after link is rendered
               encodedUrl += getParameterString(characterEncoding, new UIConversationId(), first);
               first = false;
  +         if ( Conversation.instance().isLongRunning() || Conversation.instance().isNested() )
  +         {
               encodedUrl += getParameterString(characterEncoding, new UIConversationIsLongRunning(), first);
            }
         }
  
  
  
  1.26      +3 -2      jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HtmlLink.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- HtmlLink.java	18 Dec 2006 22:48:31 -0000	1.25
  +++ HtmlLink.java	19 Dec 2006 17:22:11 -0000	1.26
  @@ -139,10 +139,11 @@
         
         if ( "default".equals(propagation) || "join".equals(propagation) || "nest".equals(propagation) || "end".equals(propagation) )
         {
  -         if ( Conversation.instance().isLongRunning() || Conversation.instance().isNested() )
  -         {
  +         //always add the id, since conversations could begin after link is rendered
               encodedUrl += getParameterString(characterEncoding, new UIConversationId(), first);
               first = false;
  +         if ( Conversation.instance().isLongRunning() || Conversation.instance().isNested() )
  +         {
               encodedUrl += getParameterString(characterEncoding, new UIConversationIsLongRunning(), first);
            }
         }