[Nhibernate-commit] nhibernate/src/NHibernate/Util IdentityMap.cs,1.10,1.11 SequencedHashMap.cs,1.5,1.6

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9124/NHibernate/Util

Modified Files:
	IdentityMap.cs SequencedHashMap.cs 
Log Message:
Added [Serializable] and code required to make them serializable to classes.

Index: IdentityMap.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/IdentityMap.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IdentityMap.cs	22 Jul 2004 13:31:37 -0000	1.10
--- IdentityMap.cs	9 Aug 2004 03:18:49 -0000	1.11
***************
*** 2,5 ****
--- 2,6 ----
  using System.Collections;
  using System.Collections.Specialized;
+ using System.Runtime.Serialization;
  
  namespace NHibernate.Util 
***************
*** 26,30 ****
  	/// </remarks>
  	[Serializable]
! 	public sealed class IdentityMap : IDictionary 
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(IdentityMap));
--- 27,31 ----
  	/// </remarks>
  	[Serializable]
! 	public sealed class IdentityMap : IDictionary	 
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(IdentityMap));
***************
*** 33,37 ****
  		// value = object passed in
  		IDictionary map;
- 
  	
  		/// <summary>
--- 34,37 ----
***************
*** 268,271 ****
--- 268,272 ----
  		/// Only for use in IdentityMap.
  		/// </remarks>
+ 		[Serializable]
  		private class IdentityComparer : IComparer
  		{
***************
*** 313,316 ****
--- 314,318 ----
  			#endregion
  		}
+ 
  	}
  }

Index: SequencedHashMap.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/SequencedHashMap.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SequencedHashMap.cs	7 Aug 2004 04:57:13 -0000	1.5
--- SequencedHashMap.cs	9 Aug 2004 03:18:49 -0000	1.6
***************
*** 74,78 ****
  	/// </remarks>
  	[Serializable]
! 	public class SequencedHashMap : IDictionary, ISerializable, IDeserializationCallback
  	{
  		
--- 74,78 ----
  	/// </remarks>
  	[Serializable]
! 	public class SequencedHashMap : IDictionary
  	{
  		
***************
*** 674,708 ****
  			#endregion			
  		}
- 
- 		
- 		#region ISerializable Members
- 
- 		SerializationInfo _info;
- 
- 		protected SequencedHashMap(SerializationInfo info, StreamingContext context) 
- 		{
- 			_info = info;
- 		}
- 
- 		public void GetObjectData(SerializationInfo info, StreamingContext context)
- 		{
- 			info.AddValue( "_sentinel", _sentinel, typeof(SequencedHashMap.Entry) );
- 			info.AddValue( "_modCount", _modCount );
- 			info.AddValue( "_entries", _entries );
- 		}
- 
- 		#endregion
- 
- 		#region IDeserializationCallback Members
- 
- 		public void OnDeserialization(object sender)
- 		{
- 			_sentinel = (SequencedHashMap.Entry)_info.GetValue( "_sentinel", typeof(SequencedHashMap.Entry) );
- 			_modCount = _info.GetInt64("_modCount");
- 			_entries = (Hashtable)_info.GetValue( "_entries", typeof(Hashtable) );
- 			_info = null;
- 		}
- 
- 		#endregion
  	}
  }
--- 674,677 ----