taylor      2005/05/23 14:56:31

  Modified:    src/java/org/apache/jetspeed/om/security/turbine
                        TurbineUserPeer.java
  Log:
  only do default dates on new users
  
  Revision  Changes    Path
  1.10      +8 -5      
jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/turbine/TurbineUserPeer.java
  
  Index: TurbineUserPeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/turbine/TurbineUserPeer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TurbineUserPeer.java      23 May 2005 21:51:14 -0000      1.9
  +++ TurbineUserPeer.java      23 May 2005 21:56:31 -0000      1.10
  @@ -318,13 +318,16 @@
           }
           
           // fix for MySQL failing to retrieve bad values generated by Village
  -        Date created = user.getCreateDate();
  -        if (created == null)
  +        if (user.isNew())
           {
  -            created = new Date();
  +            Date created = user.getCreateDate();
  +            if (created == null)
  +            {
  +                created = new Date();
  +            }
  +            criteria.add( "TURBINE_USER.CREATED", created);
  +            criteria.add( "TURBINE_USER.PASSWORD_CHANGED", created);
           }
  -        criteria.add( "TURBINE_USER.CREATED", created);
  -        criteria.add( "TURBINE_USER.PASSWORD_CHANGED", created);
           
           String dataKey = new 
StringBuffer(TABLE_NAME).append('.').append(TURBINE_OBJECTDATA).toString();
           criteria.add( dataKey, permData );
  
  
  

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

Reply via email to