cvs commit: jakarta-struts/src/share/org/apache/struts/util RequestUtils.java

[martinc]

martinc     01/08/05 12:00:29

  Modified:    src/share/org/apache/struts/util RequestUtils.java
  Log:
  Ported transaction token fix for computeParameters().
  PR: 2636
  Submitted by: Oliver Willenbrock (Thanks for the fix!)
  
  Revision  Changes    Path
  1.21      +5 -5      
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
  
  Index: RequestUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- RequestUtils.java 2001/08/05 18:25:30     1.20
  +++ RequestUtils.java 2001/08/05 19:00:29     1.21
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v 1.20 
2001/08/05 18:25:30 martinc Exp $
  - * $Revision: 1.20 $
  - * $Date: 2001/08/05 18:25:30 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v 1.21 
2001/08/05 19:00:29 martinc Exp $
  + * $Revision: 1.21 $
  + * $Date: 2001/08/05 19:00:29 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * in the Struts controller framework.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.20 $ $Date: 2001/08/05 18:25:30 $
  + * @version $Revision: 1.21 $ $Date: 2001/08/05 19:00:29 $
    */
   
   public class RequestUtils {
  @@ -181,7 +181,7 @@
           throws JspException {
   
           // Short circuit if no parameters are specified
  -        if ((paramId == null) && (name == null))
  +        if ((paramId == null) && (name == null) && !transaction)
               return (null);
   
           // Locate the Map containing our multi-value parameters map