From: Michael D. <mik...@us...> - 2004-07-13 06:48:38
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557/src/NHibernate/Impl Modified Files: SessionImpl.cs Log Message: finished synching with h2.0.3 Index: SessionImpl.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** SessionImpl.cs 7 Jul 2004 05:20:28 -0000 1.33 --- SessionImpl.cs 13 Jul 2004 06:48:30 -0000 1.34 *************** *** 1985,1990 **** } ! //TODO: Resume synch with H2.0.3 here... ! public object Load(System.Type clazz, object id) { if (id==null) throw new NullReferenceException("null is not a valid identifier"); object result = DoLoadByClass(clazz, id, true, true); --- 1985,1990 ---- } ! public object Load(System.Type clazz, object id) [...2145 lines suppressed...] ! ! private static readonly ICollection EmptyCollection = new ArrayList(0); ! ! public ICollection GetOrphans(PersistentCollection coll) { ! CollectionEntry ce = GetCollectionEntry(coll); ! return ce.IsNew ? EmptyCollection : coll.GetOrphans(ce.Snapshot); } - } } --- 3911,3918 ---- } ! public object GetVersion(object entity) { ! return GetEntry(entity).Version; } } } |