[Hibernate-commits] Hibernate2/src/net/sf/hibernate/type AbstractType.java,1.5,1.6 ArrayType.java,1.6,1.7 BagType.java,1.6,1.7 EntityType.java,1.5,1.6 ListType.java,1.6,1.7 ManyToOneType.java,1.3,1.4 MapType.java,1.6,1.7 OneToOneType.java,1.5,1.6 PersistentCollectionType.java,1.7,1.8 SetType.java,1.6,1.7 SortedMapType.java,1.6,1.7 SortedSetType.java,1.6,1.7 Type.java,1.6,1.7

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

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

Modified Files:
	AbstractType.java ArrayType.java BagType.java EntityType.java 
	ListType.java ManyToOneType.java MapType.java 
	OneToOneType.java PersistentCollectionType.java SetType.java 
	SortedMapType.java SortedSetType.java Type.java 
Log Message:
fixed problem where <parent> was not being set after retrieval from cache

Index: AbstractType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/AbstractType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractType.java	2 Feb 2003 04:19:52 -0000	1.5
--- AbstractType.java	9 Feb 2003 07:41:16 -0000	1.6
***************
*** 65,69 ****
  		}
  		
! 		public Object resolveIdentifier(Object value, SessionImplementor session)
  		throws HibernateException, SQLException {
  			return value;
--- 65,69 ----
  		}
  		
! 		public Object resolveIdentifier(Object value, SessionImplementor session, Object owner)
  		throws HibernateException, SQLException {
  			return value;

Index: ArrayType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ArrayType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ArrayType.java	9 Feb 2003 06:28:16 -0000	1.6
--- ArrayType.java	9 Feb 2003 07:41:16 -0000	1.7
***************
*** 65,72 ****
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled)
  		throws HibernateException, SQLException {
  			
! 		return new ArrayHolder(session, persister, disassembled);
  	}
  
--- 65,73 ----
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled,
! 		Object owner)
  		throws HibernateException, SQLException {
  			
! 		return new ArrayHolder(session, persister, disassembled, owner);
  	}
  

Index: BagType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/BagType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BagType.java	9 Feb 2003 06:28:16 -0000	1.6
--- BagType.java	9 Feb 2003 07:41:16 -0000	1.7
***************
*** 36,43 ****
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled)
  		throws HibernateException, SQLException {
  			
! 		return new Bag(session, persister, disassembled);
  	}
  	
--- 36,44 ----
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled,
! 		Object owner)
  		throws HibernateException, SQLException {
  			
! 		return new Bag(session, persister, disassembled, owner);
  	}
  	

Index: EntityType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/EntityType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EntityType.java	2 Feb 2003 04:19:52 -0000	1.5
--- EntityType.java	9 Feb 2003 07:41:16 -0000	1.6
***************
*** 103,107 ****
  	
  	public Object assemble(Serializable oid, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		return resolveIdentifier(oid, session);
  	}
  	
--- 103,107 ----
  	
  	public Object assemble(Serializable oid, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		return resolveIdentifier(oid, session, owner);
  	}
  	
***************
*** 115,119 ****
  	
  	public final Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		return resolveIdentifier( hydrate(rs, names, session, owner), session );
  	}
  	
--- 115,119 ----
  	
  	public final Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		return resolveIdentifier( hydrate(rs, names, session, owner), session, owner );
  	}
  	

Index: ListType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ListType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ListType.java	9 Feb 2003 06:28:16 -0000	1.6
--- ListType.java	9 Feb 2003 07:41:16 -0000	1.7
***************
*** 32,39 ****
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled)
  		throws HibernateException, SQLException {
  			
! 		return new List(session, persister, disassembled);
  	}
  
--- 32,40 ----
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled,
! 		Object owner)
  		throws HibernateException, SQLException {
  			
! 		return new List(session, persister, disassembled, owner);
  	}
  

Index: ManyToOneType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ManyToOneType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ManyToOneType.java	5 Jan 2003 02:11:24 -0000	1.3
--- ManyToOneType.java	9 Feb 2003 07:41:16 -0000	1.4
***************
*** 54,58 ****
  		}
  		
! 		public Object resolveIdentifier(Object value, SessionImplementor session)
  		throws HibernateException, SQLException {
  			
--- 54,58 ----
  		}
  		
! 		public Object resolveIdentifier(Object value, SessionImplementor session, Object owner)
  		throws HibernateException, SQLException {
  			

Index: MapType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/MapType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MapType.java	9 Feb 2003 06:28:16 -0000	1.6
--- MapType.java	9 Feb 2003 07:41:16 -0000	1.7
***************
*** 38,45 ****
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled)
  		throws HibernateException, SQLException {
  			
! 		return new Map(session, persister, disassembled);
  	}
  
--- 38,46 ----
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled,
! 		Object owner)
  		throws HibernateException, SQLException {
  			
! 		return new Map(session, persister, disassembled, owner);
  	}
  

Index: OneToOneType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/OneToOneType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OneToOneType.java	2 Feb 2003 04:19:52 -0000	1.5
--- OneToOneType.java	9 Feb 2003 07:41:16 -0000	1.6
***************
*** 62,66 ****
  	}
  	
! 	public Object resolveIdentifier(Object value, SessionImplementor session) throws HibernateException, SQLException {
  		
  		if (value==null) return null;
--- 62,66 ----
  	}
  	
! 	public Object resolveIdentifier(Object value, SessionImplementor session, Object owner) throws HibernateException, SQLException {
  		
  		if (value==null) return null;

Index: PersistentCollectionType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/PersistentCollectionType.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PersistentCollectionType.java	9 Feb 2003 06:28:16 -0000	1.7
--- PersistentCollectionType.java	9 Feb 2003 07:41:16 -0000	1.8
***************
*** 46,57 ****
  	
  	public Object nullSafeGet(ResultSet rs, String[] name, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		return resolveIdentifier( hydrate(rs, name, session, owner), session );
  	}
  	
! 	public Object getCollection(Serializable id, SessionImplementor session) throws HibernateException, SQLException {
  		
  		CollectionPersister persister = session.getFactory().getCollectionPersister(role);
  		
! 		PersistentCollection collection = persister.getCachedCollection(id, session);
  		if (collection!=null) {
  			session.addInitializedCollection(collection, persister, id);
--- 46,57 ----
  	
  	public Object nullSafeGet(ResultSet rs, String[] name, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		return resolveIdentifier( hydrate(rs, name, session, owner), session, owner );
  	}
  	
! 	public Object getCollection(Serializable id, Object owner, SessionImplementor session) throws HibernateException, SQLException {
  		
  		CollectionPersister persister = session.getFactory().getCollectionPersister(role);
  		
! 		PersistentCollection collection = persister.getCachedCollection(id, owner, session);
  		if (collection!=null) {
  			session.addInitializedCollection(collection, persister, id);
***************
*** 111,115 ****
  	
  	public Object assemble(Serializable cached, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		return resolveIdentifier(cached, session);
  	}
  	
--- 111,115 ----
  	
  	public Object assemble(Serializable cached, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		return resolveIdentifier(cached, session, owner);
  	}
  	
***************
*** 154,158 ****
  	}
  	
! 	public Object resolveIdentifier(Object value, SessionImplementor session)
  	throws HibernateException, SQLException {
  		
--- 154,158 ----
  	}
  	
! 	public Object resolveIdentifier(Object value, SessionImplementor session, Object owner)
  	throws HibernateException, SQLException {
  		
***************
*** 161,165 ****
  		}
  		else {
! 			return getCollection( (Serializable) value, session);
  		}
  	}
--- 161,165 ----
  		}
  		else {
! 			return getCollection( (Serializable) value, owner, session);
  		}
  	}
***************
*** 172,176 ****
  		SessionImplementor session, 
  		CollectionPersister persister, 
! 		Serializable disassembled) throws HibernateException, SQLException;
  	
  }
--- 172,177 ----
  		SessionImplementor session, 
  		CollectionPersister persister, 
! 		Serializable disassembled,
! 		Object owner) throws HibernateException, SQLException;
  	
  }

Index: SetType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SetType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SetType.java	9 Feb 2003 06:28:16 -0000	1.6
--- SetType.java	9 Feb 2003 07:41:16 -0000	1.7
***************
*** 32,38 ****
  		SessionImplementor session, 
  		CollectionPersister persister, 
! 		Serializable disassembled) throws HibernateException, SQLException {
  		
! 		return new Set(session, persister, disassembled);
  	}
  
--- 32,39 ----
  		SessionImplementor session, 
  		CollectionPersister persister, 
! 		Serializable disassembled, 
! 		Object owner) throws HibernateException, SQLException {
  		
! 		return new Set(session, persister, disassembled, owner);
  	}
  

Index: SortedMapType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SortedMapType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SortedMapType.java	9 Feb 2003 06:28:16 -0000	1.6
--- SortedMapType.java	9 Feb 2003 07:41:16 -0000	1.7
***************
*** 39,46 ****
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled)
  		throws HibernateException, SQLException {
  
! 		return new SortedMap(session, persister, comparator, disassembled);	
  	}
  
--- 39,47 ----
  		SessionImplementor session,
  		CollectionPersister persister,
! 		Serializable disassembled,
! 		Object owner)
  		throws HibernateException, SQLException {
  
! 		return new SortedMap(session, persister, comparator, disassembled, owner);	
  	}
  

Index: SortedSetType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SortedSetType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SortedSetType.java	9 Feb 2003 06:28:16 -0000	1.6
--- SortedSetType.java	9 Feb 2003 07:41:16 -0000	1.7
***************
*** 39,45 ****
  		SessionImplementor session, 
  		CollectionPersister persister, 
! 		Serializable disassembled) throws HibernateException, SQLException {
  		
! 		return new SortedSet(session, persister, comparator, disassembled);
  	}
  	
--- 39,46 ----
  		SessionImplementor session, 
  		CollectionPersister persister, 
! 		Serializable disassembled,
! 		Object owner) throws HibernateException, SQLException {
  		
! 		return new SortedSet(session, persister, comparator, disassembled, owner);
  	}
  	

Index: Type.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/Type.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Type.java	2 Feb 2003 04:19:52 -0000	1.6
--- Type.java	9 Feb 2003 07:41:16 -0000	1.7
***************
*** 222,225 ****
--- 222,226 ----
  	 * @see Type#hydrate(ResultSet, String[], SessionImplementor, Object)
  	 * @param value an identifier or value returned by <tt>hydrate()</tt>
+ 	 * @param owner the parent entity
  	 * @param session the session
  	 * @return the given value, or the value associated with the identifier
***************
*** 227,231 ****
  	 * @throws SQLException
  	 */
! 	public Object resolveIdentifier(Object value, SessionImplementor session) throws HibernateException, SQLException;
  }
  
--- 228,232 ----
  	 * @throws SQLException
  	 */
! 	public Object resolveIdentifier(Object value, SessionImplementor session, Object owner) throws HibernateException, SQLException;
  }