[Hibernate-commits] Hibernate/cirrus/hibernate/impl CollectionPersister.java,1.83,1.84 DatastoreImpl.java,1.21,1.22

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv21277/cirrus/hibernate/impl

Modified Files:
	CollectionPersister.java DatastoreImpl.java 
Log Message:
fixed a bug where id column was sometimes nullable

Index: CollectionPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/CollectionPersister.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** CollectionPersister.java	31 Oct 2002 14:00:26 -0000	1.83
--- CollectionPersister.java	24 Nov 2002 11:48:10 -0000	1.84
***************
*** 93,99 ****
  		
  		isToplevel = collection.isToplevel();
! 		keyType = collection.getIdentifier().getType();
! 		Iterator iter = collection.getIdentifier().getColumnIterator();
! 		int span = collection.getIdentifier().getColumnSpan();
  		keyColumnNames = new String[span];
  		int k=0;
--- 93,99 ----
  		
  		isToplevel = collection.isToplevel();
! 		keyType = collection.getKey().getType();
! 		Iterator iter = collection.getKey().getColumnIterator();
! 		int span = collection.getKey().getColumnSpan();
  		keyColumnNames = new String[span];
  		int k=0;
***************
*** 105,109 ****
  		
  		if (isToplevel) {
! 			idgen = collection.getIdentifier().getIdentifierGenerator();
  		}
  		else {
--- 105,109 ----
  		
  		if (isToplevel) {
! 			idgen = collection.getKey().getIdentifierGenerator();
  		}
  		else {

Index: DatastoreImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/DatastoreImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** DatastoreImpl.java	11 Nov 2002 10:09:55 -0000	1.21
--- DatastoreImpl.java	24 Nov 2002 11:48:11 -0000	1.22
***************
*** 48,52 ****
  	}
  	public Type getCollectionKeyType(String role) throws MappingException {
! 		return ( (Collection) collections.get(role) ).getIdentifier().getType();
  	}
  
--- 48,52 ----
  	}
  	public Type getCollectionKeyType(String role) throws MappingException {
! 		return ( (Collection) collections.get(role) ).getKey().getType();
  	}