From: Michael D. <mik...@us...> - 2004-07-13 20:55:24
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9772/NHibernate/Impl Modified Files: SessionImpl.cs Log Message: Fixed bug with array based collections having the records deleted from the many-to-many table when fetched with hql. Index: SessionImpl.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** SessionImpl.cs 13 Jul 2004 06:48:30 -0000 1.34 --- SessionImpl.cs 13 Jul 2004 20:55:15 -0000 1.35 *************** *** 193,197 **** /// </remarks> [Serializable] ! internal class SessionImpl : ISessionImplementor, IDisposable { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(SessionImpl)); --- 193,197 ---- /// </remarks> [Serializable] ! internal class SessionImpl : ISessionImplementor { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(SessionImpl)); *************** *** 3346,3353 **** foreach (LoadingCollectionEntry lce in loadingCollections.Values) { ! //lce.collection.EndRead(); ! lce.Collection.EndRead(persister, lce.Owner); ! AddInitializedCollection(lce.Collection, persister, lce.Id); ! persister.Cache(lce.Id, lce.Collection, this); } --- 3346,3355 ---- foreach (LoadingCollectionEntry lce in loadingCollections.Values) { ! if(lce.Initialize) ! { ! lce.Collection.EndRead(persister, lce.Owner); ! AddInitializedCollection(lce.Collection, persister, lce.Id); ! persister.Cache(lce.Id, lce.Collection, this); ! } } *************** *** 3578,3585 **** } ! //~SessionImpl() { void IDisposable.Dispose() { ! log.Debug("running Session.Finalize()"); // it was never disconnected --- 3580,3591 ---- } ! #region System.IDisposable Members ! ! /// <summary> ! /// Just in case the user forgot to Commit() or Close() ! /// </summary> void IDisposable.Dispose() { ! log.Debug("running ISession.Dispose()"); // it was never disconnected *************** *** 3600,3603 **** --- 3606,3612 ---- } + #endregion + + public static void Handle(Exception e) { |