NH-4077 - fix for auto-flush triggered from flush events.

Author: fredericDelaporte

src/NHibernate/Async/Impl/SessionImpl.cs

@@ -961,10 +961,18 @@ public override async Task<object> InternalLoadAsync(string entityName, object i
 				{
 					throw new HibernateException("Flush during cascade is dangerous");
 				}
-				IFlushEventListener[] flushEventListener = listeners.FlushEventListeners;
-				for (int i = 0; i < flushEventListener.Length; i++)
+				dontFlushFromFind++;
+				try
+				{
+					IFlushEventListener[] flushEventListener = listeners.FlushEventListeners;
+					for (int i = 0; i < flushEventListener.Length; i++)
+					{
+						await (flushEventListener[i].OnFlushAsync(new FlushEvent(this), cancellationToken)).ConfigureAwait(false);
+					}
+				}
+				finally
 				{
-					await (flushEventListener[i].OnFlushAsync(new FlushEvent(this), cancellationToken)).ConfigureAwait(false);
+					dontFlushFromFind--;
 				}
 			}
 		}

src/NHibernate/Impl/SessionImpl.cs

@@ -1360,10 +1360,18 @@ public override void Flush()
 				{
 					throw new HibernateException("Flush during cascade is dangerous");
 				}
-				IFlushEventListener[] flushEventListener = listeners.FlushEventListeners;
-				for (int i = 0; i < flushEventListener.Length; i++)
+				dontFlushFromFind++;
+				try
+				{
+					IFlushEventListener[] flushEventListener = listeners.FlushEventListeners;
+					for (int i = 0; i < flushEventListener.Length; i++)
+					{
+						flushEventListener[i].OnFlush(new FlushEvent(this));
+					}
+				}
+				finally
 				{
-					flushEventListener[i].OnFlush(new FlushEvent(this));
+					dontFlushFromFind--;
 				}
 			}
 		}