implab/ImplabNet Commit - r216:1e082fb67a46

Fixed component container

cin -

r216:1e082fb67a46 v2

parent child

Context file:

r216:1e082fb67a46

Collapse all files

Implab/Components/ComponentContainer.cs +21 -18

                  /// </summary>
                  /// <remarks>Instanses of this class are thread safe.</remarks>
                  public class ComponentContainer<T> : Disposable, ICollection<T> {
-                     readonly HashSet<T> m_components = new HashSet<T>();
+                     List<T> m_components = new List<T>();
+                     readonly object m_lock = new object();
                      /// <summary>
                      /// Removes currently stored compoenents from the container and disposes them if possible.
                      /// A new components may be added before this method completes.
                      /// </remarks>
                      public void Clear() {
-                         T[] removed;
+                         List<T> removed;
-                         lock (m_components) {
-                             removed = new T[m_components.Count];
-                             m_components.CopyTo(removed);
-                             m_components.Clear();
+                         lock (m_lock) {
+                             removed = m_components;
+                             m_components = new List<T>();
                          }
                          foreach (var item in removed.OfType<IDisposable>())
                      /// </summary>
                      /// <param name="item">The item to check.</param>
                      public bool Contains(T item) {
-                         lock (m_components)
+                         lock (m_lock)
                              return m_components.Contains(item);
                      }
                      /// <param name="array">A destination array for components.</param>
                      /// <param name="arrayIndex">A starting index in the destination array.</param>
                      public void CopyTo(T[] array, int arrayIndex) {
-                         lock (m_components)
+                         lock (m_lock)
                              m_components.CopyTo(array, arrayIndex);
                      }
                      /// </summary>
                      /// <param name="item">The item to remove.</param>
                      public bool Remove(T item) {
-                         lock (m_components)
+                         lock (m_lock)
                              return m_components.Remove(item);
                      }
                      /// </summary>
                      public int Count {
                          get {
-                             lock (m_components)
+                             lock (m_lock)
                                  return m_components.Count;
                          }
                      }
                      /// </summary>
                      /// <returns>The enumerator.</returns>
                      public IEnumerator<T> GetEnumerator() {
-                         T[] items;
-                         lock (m_components) {
-                             items = new T[m_components.Count];
+                         T[] items = new T[m_components.Count];
+                         lock (m_lock) {
                              m_components.CopyTo(items);
+                         }
-                             return (IEnumerator<T>)items.GetEnumerator();
-                         }
+                     }
                      System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
                          return GetEnumerator();
                      /// </remarks>
                      public void Add(T item) {
                          Safe.ArgumentNotNull(item, "item");
-                         lock (m_components) {
+                         bool dispose = false;
+                         lock (m_lock) {
                              if (IsDisposed)
-                                 Safe.Dispose(item);
+                                 dispose = true;
                              else
                                  m_components.Add(item);
                          }
+                         if (dispose)
+                             Safe.Dispose(item);
                      }
                      /// <summary>
                      /// </summary>
                      /// <param name="disposing">If set to <c>true</c> the collection is disposing.</param>
                      protected override void Dispose(bool disposing) {
+                         if (disposing)
+                             Clear();
                          base.Dispose(disposing);
-                         Clear();
                      }
                  }
              }

General Comments 3

sergey

|

Auto status change to "Under Review"

sergey

|

ok, latest stable version should be in default

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages