dlr         01/09/01 08:58:23

  Modified:    src/java/org/apache/torque/om DateKey.java
  Log:
  Forward-ported Fedor's change:
  
    "Reverted my change to DateKey.toString() - it was an attempt to solve the
    problem above, but did not work out very well. With the fix above it is no
    longer needed, and it was causing inconsistent behaviour - toString()
    results were different depending on the history of the DateKey."
  
  Revision  Changes    Path
  1.5       +2 -5      
jakarta-turbine-torque/src/java/org/apache/torque/om/DateKey.java
  
  Index: DateKey.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/DateKey.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- DateKey.java      2001/08/20 03:51:55     1.4
  +++ DateKey.java      2001/09/01 15:58:23     1.5
  @@ -155,10 +155,7 @@
   
       public String toString()
       {
  -        if ( key != null )
  -        {
  -            return key.toString();
  -        }
  -        return "";
  +        Date dt = getDate();
  +        return (dt == null ? "" : Long.toString(dt.getTime()));
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to