You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by gl...@apache.org on 2001/07/18 02:36:28 UTC

cvs commit: jakarta-taglibs/datetime/src/org/apache/taglibs/datetime FormatTag.java

glenn       01/07/17 17:36:28

  Modified:    datetime/src/org/apache/taglibs/datetime FormatTag.java
  Log:
  Fix a bug in format tag where date gets reused in containers that reuse tag handlers
  
  Revision  Changes    Path
  1.9       +7 -6      jakarta-taglibs/datetime/src/org/apache/taglibs/datetime/FormatTag.java
  
  Index: FormatTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/datetime/src/org/apache/taglibs/datetime/FormatTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FormatTag.java	2001/07/15 16:29:17	1.8
  +++ FormatTag.java	2001/07/18 00:36:28	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-taglibs/datetime/src/org/apache/taglibs/datetime/FormatTag.java,v 1.8 2001/07/15 16:29:17 glenn Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/07/15 16:29:17 $
  + * $Header: /home/cvs/jakarta-taglibs/datetime/src/org/apache/taglibs/datetime/FormatTag.java,v 1.9 2001/07/18 00:36:28 glenn Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/07/18 00:36:28 $
    *
    * ====================================================================
    *
  @@ -174,7 +174,8 @@
   	String s = body.getString().trim();  
   	// Clear the body since we will output only the formatted date
   	body.clearBody();
  -	if( date == null ) {
  +        Date format_date = date;
  +	if( format_date == null ) {
   	    long time;
   	    try {
   	        time = Long.valueOf(s).longValue();
  @@ -182,7 +183,7 @@
   	        date_formatted = default_text;
   	        return SKIP_BODY;
   	    }
  -	    date = new Date(time);
  +	    format_date = new Date(time);
   	}
   
           // Get the pattern to use
  @@ -220,7 +221,7 @@
           }
   
   	// Format the date for display
  -	date_formatted = sdf.format(date);
  +	date_formatted = sdf.format(format_date);
   	return SKIP_BODY;
       }