Fixing concurrency handling when we are disposed.

ravendb · Aug 24, 2011 · 2b51434 · 2b51434
1 parent 4a66860
commit 2b51434
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 23 deletions.
diff --git a/Raven.Storage.Esent/TransactionalStorage.cs b/Raven.Storage.Esent/TransactionalStorage.cs
@@ -327,23 +327,27 @@ private bool EnsureDatabaseIsCreatedAndAttachToDatabase()
 		[DebuggerHidden, DebuggerNonUserCode, DebuggerStepThrough]
 		public void Batch(Action<IStorageActionsAccessor> action)
 		{
-			if (disposed)
+            if (disposerLock.IsReadLockHeld) // we are currently in a nested Batch call
-			{
+            {
-				Trace.WriteLine("TransactionalStorage.Batch was called after it was disposed, call was ignored.");
+                if (current.Value != null) // check again, just to be sure
-				return; // this may happen if someone is calling us from the finalizer thread, so we can't even throw on that
+                {
-			}
+                    action(current.Value);
-			if (current.Value != null)
+                    return;
-			{
+                }
-				action(current.Value);
+            }
-				return;
-			}
 			disposerLock.EnterReadLock();
 			try
 			{
 				ExecuteBatch(action);
 			}
 			catch (EsentErrorException e)
-			{
+            {
+                if (disposed)
+                {
+                    Trace.WriteLine("TransactionalStorage.Batch was called after it was disposed, call was ignored.");
+                    return; // this may happen if someone is calling us from the finalizer thread, so we can't even throw on that
+                }
+
 				switch (e.Error)
 				{
 					case JET_err.WriteConflict:
@@ -357,7 +361,8 @@ public void Batch(Action<IStorageActionsAccessor> action)
 			finally
 			{
 				disposerLock.ExitReadLock();
-				current.Value = null;
+                if(disposed == false)
+                    current.Value = null;
 			}
 		}
 

diff --git a/Raven.Storage.Managed/TransactionalStorage.cs b/Raven.Storage.Managed/TransactionalStorage.cs
@@ -86,20 +86,23 @@ public Guid Id
 		[DebuggerNonUserCode]
 		public void Batch(Action<IStorageActionsAccessor> action)
 		{
-            if (disposed)
+            if (disposerLock.IsReadLockHeld) // we are currently in a nested Batch call
             {
-                Trace.WriteLine("TransactionalStorage.Batch was called after it was disposed, call was ignored.");
+                if (current.Value != null) // check again, just to be sure
-                return; // this may happen if someone is calling us from the finalizer thread, so we can't even throw on that
+                {
+                    action(current.Value);
+                    return;
+                }
             }
-
+		    disposerLock.EnterReadLock();
-			if(current.Value != null)
-			{
-				action(current.Value);
-				return;
-			}
-			disposerLock.EnterReadLock();
 			try
 			{
+                if (disposed)
+                {
+                    Trace.WriteLine("TransactionalStorage.Batch was called after it was disposed, call was ignored.");
+                    return; // this may happen if someone is calling us from the finalizer thread, so we can't even throw on that
+                }
+
 
 				Interlocked.Exchange(ref lastUsageTime, SystemTime.Now.ToBinary());
 				using (tableStroage.BeginTransaction())
@@ -115,7 +118,8 @@ public void Batch(Action<IStorageActionsAccessor> action)
 			finally
 			{
 				disposerLock.ExitReadLock();
-				current.Value = null;
+                if(disposed ==false)
+                    current.Value = null;
 			}
 		}
 

diff --git a/Raven.Tryouts/Program.cs b/Raven.Tryouts/Program.cs
@@ -1,4 +1,6 @@
 using System;
+using Raven.Client.Listeners;
+using Raven.Json.Linq;
 using Raven.Tests.Bugs;
 
 namespace Raven.Tryouts