Merge pull request #545 from pifil/master

Fixed race condition in Disposable.Dispose()
autofac · Jul 9, 2014 · bc3db14 · bc3db14
2 parents 09f27e2 + 88ae777
commit bc3db14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Core/Source/Autofac/Features/OwnedInstances/Owned.cs b/Core/Source/Autofac/Features/OwnedInstances/Owned.cs
@@ -120,8 +120,7 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                var lt = _lifetime;
-                Interlocked.CompareExchange(ref _lifetime, null, lt);
+                var lt = Interlocked.Exchange(ref _lifetime, null);
                 if (lt != null)
                 {
                     _value = default(T);

diff --git a/Core/Source/Autofac/Util/Disposable.cs b/Core/Source/Autofac/Util/Disposable.cs
@@ -43,13 +43,12 @@ public class Disposable : IDisposable
         [SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification = "Dispose is implemented correctly, FxCop just doesn't see it.")]
         public void Dispose()
         {
-            var isDisposed = _isDisposed;
-            Interlocked.CompareExchange(ref _isDisposed, DisposedFlag, isDisposed);
-            if (isDisposed == 0)
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
+            var wasDisposed = Interlocked.Exchange(ref _isDisposed, DisposedFlag);
+            if (wasDisposed == DisposedFlag)
+                return;
+
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>