[Hibernate-commits] Hibernate2/src/net/sf/hibernate/type TimestampType.java,1.4,1.5 TrueFalseType.java,1.3,1.4

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type
In directory sc8-pr-cvs1:/tmp/cvs-serv30115/sf/hibernate/type

Modified Files:
	TimestampType.java TrueFalseType.java 
Log Message:
fixed bug in TimestampType
now possible to delete and re-save an object in same session

Index: TimestampType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TimestampType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TimestampType.java	5 Jan 2003 02:11:24 -0000	1.4
--- TimestampType.java	15 Jan 2003 10:33:17 -0000	1.5
***************
*** 38,46 ****
  	
  	public Object deepCopyNotNull(Object value) {
- 		Timestamp copy = new Timestamp( ( (java.util.Date) value ).getTime() );
  		if ( value instanceof Timestamp ) {
! 			copy.setNanos( ( (Timestamp) value ).getNanos() );
  		}
- 		return copy;
  	}
  	
--- 38,51 ----
  	
  	public Object deepCopyNotNull(Object value) {
  		if ( value instanceof Timestamp ) {
! 			Timestamp orig = (Timestamp) value;
! 			Timestamp ts = new Timestamp( orig.getTime() );
! 			ts.setNanos( orig.getNanos() );
! 			return ts;
! 		}
! 		else {
! 			java.util.Date orig = (java.util.Date) value;
! 			return new java.util.Date( orig.getTime() );
  		}
  	}
  	
***************
*** 49,60 ****
  		if (x==y) return true;
  		if (x==null || y==null) return false;
- 		
- 		/*if (
- 			x instanceof Timestamp &&
- 			y instanceof Timestamp &&
- 			( (Timestamp) x ).getNanos() != ( (Timestamp) y ).getNanos()
- 		) return false;
- 		
- 		return ( (java.util.Date) x ).getTime()==( (java.util.Date) y ).getTime();*/
  		
  		long xTime = ( (java.util.Date) x ).getTime();
--- 54,57 ----

Index: TrueFalseType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TrueFalseType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrueFalseType.java	5 Jan 2003 02:11:24 -0000	1.3
--- TrueFalseType.java	15 Jan 2003 10:33:17 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  //$Id$
  package net.sf.hibernate.type;
+ 
  public class TrueFalseType extends CharBooleanType {