Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv32602/sf/hibernate/impl
Modified Files:
SessionImpl.java
Log Message:
fixed a bug wrapping sorted collections
don't ever update mutable=false objects
added where attribute to collection mappings
Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SessionImpl.java 9 Feb 2003 07:41:15 -0000 1.19
--- SessionImpl.java 15 Feb 2003 01:00:52 -0000 1.20
***************
*** 1140,1144 ****
if (old==object) {
throw new AssertionFailure(
! "Hibernate has a bug in update() ... or you are using an illegal id type" +
infoString(persister, id)
);
--- 1140,1144 ----
if (old==object) {
throw new AssertionFailure(
! "Hibernate has a bug in update() ... or you are using an illegal id type: " +
infoString(persister, id)
);
***************
*** 1943,1947 ****
entry.id +
" to " + oid
-
);
}
--- 1943,1946 ----
***************
*** 1977,1981 ****
cannotDirtyCheck = entry.loadedState==null; // object loaded by update()
if (!cannotDirtyCheck) {
! dirtyProperties = dirtyProperties = persister.findDirty(values, entry.loadedState, object, this);
}
}
--- 1976,1980 ----
cannotDirtyCheck = entry.loadedState==null; // object loaded by update()
if (!cannotDirtyCheck) {
! dirtyProperties = persister.findDirty(values, entry.loadedState, object, this);
}
}
***************
*** 1986,1996 ****
// compare to cached state (ignoring nested collections)
! if (
! cannotDirtyCheck ||
! (dirtyProperties!=null && dirtyProperties.length!=0 ) || (
! status==LOADED &&
! persister.isVersioned() &&
! persister.hasCollections() &&
! searchForDirtyCollections(values, types)
)
) { // its dirty!
--- 1985,1997 ----
// compare to cached state (ignoring nested collections)
! if (
! persister.isMutable() && (
! cannotDirtyCheck ||
! ( dirtyProperties!=null && dirtyProperties.length!=0 ) || (
! status==LOADED &&
! persister.isVersioned() &&
! persister.hasCollections() &&
! searchForDirtyCollections(values, types)
! )
)
) { // its dirty!
|
