Guards against use of a disposed session factory

src/NHibernate.Test/Async/SessionBuilder/Fixture.cs

@@ -227,5 +227,22 @@ private void CanSetOnStateless<T, V>(
 				Assert.AreEqual(sb, fsb, $"{sbType}: Unexpected fluent return after call with {value}");
 			}
 		}
+
+		[Test]
+		public void ThrowWhenUsingSessionFromDisposedFactoryAsync()
+		{
+			using (var session = Sfi.OpenSession())
+			{
+				try
+				{
+					Sfi.Dispose();
+					Assert.That(() => session.GetAsync<Entity>(Guid.Empty), Throws.InstanceOf(typeof(ObjectDisposedException)));
+				}
+				finally
+				{
+					RebuildSessionFactory();
+				}
+			}
+		}
 	}
 }

src/NHibernate.Test/SessionBuilder/Fixture.cs

@@ -298,5 +298,36 @@ private void CanSetOnStateless<T, V>(
 				Assert.AreEqual(sb, fsb, $"{sbType}: Unexpected fluent return after call with {value}");
 			}
 		}
+
+		[Test]
+		public void ThrowWhenOpeningFromDisposedFactory()
+		{
+			try
+			{
+				Sfi.Dispose();
+				Assert.That(Sfi.OpenSession, Throws.InstanceOf(typeof(ObjectDisposedException)));
+			}
+			finally
+			{
+				RebuildSessionFactory();
+			}
+		}
+
+		[Test]
+		public void ThrowWhenUsingSessionFromDisposedFactory()
+		{
+			using (var session = Sfi.OpenSession())
+			{
+				try
+				{
+					Sfi.Dispose();
+					Assert.That(() => session.Get<Entity>(Guid.Empty), Throws.InstanceOf(typeof(ObjectDisposedException)));
+				}
+				finally
+				{
+					RebuildSessionFactory();
+				}
+			}
+		}
 	}
 }

src/NHibernate/Async/Impl/SessionFactoryImpl.cs

@@ -353,6 +353,7 @@ async Task InternalEvictCollectionAsync()
 			// NH Different implementation
 			if (queryCache != null)
 			{
+				CheckNotClosed();
 				await (queryCache.ClearAsync(cancellationToken)).ConfigureAwait(false);
 				if (queryCaches.Count == 0)
 				{
@@ -377,6 +378,7 @@ async Task InternalEvictCollectionAsync()
 				{
 					if (settings.IsQueryCacheEnabled)
 					{
+						CheckNotClosed();
 						if (queryCaches.TryGetValue(cacheRegion, out var currentQueryCache))
 						{
 							return currentQueryCache.Value.ClearAsync(cancellationToken);

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -469,7 +469,11 @@ private ICacheConcurrencyStrategy GetCacheConcurrencyStrategy(
 
 		public EventListeners EventListeners
 		{
-			get { return eventListeners; }
+			get
+			{
+				CheckNotClosed();
+				return eventListeners;
+			}
 		}
 
 		#region IObjectReference Members
@@ -513,6 +517,7 @@ public object GetRealObject(StreamingContext context)
 
 		public ISessionBuilder WithOptions()
 		{
+			CheckNotClosed();
 			return new SessionBuilderImpl(this);
 		}
 
@@ -563,6 +568,7 @@ public ISession OpenSession(DbConnection connection, bool flushBeforeCompletionE
 
 		public IStatelessSessionBuilder WithStatelessOptions()
 		{
+			CheckNotClosed();
 			return new StatelessSessionBuilderImpl(this);
 		}
 
@@ -580,6 +586,7 @@ public IStatelessSession OpenStatelessSession(DbConnection connection)
 
 		public IEntityPersister GetEntityPersister(string entityName)
 		{
+			CheckNotClosed();
 			IEntityPersister value;
 			if (entityPersisters.TryGetValue(entityName, out value) == false)
 				throw new MappingException("No persister for: " + entityName);
@@ -588,13 +595,15 @@ public IEntityPersister GetEntityPersister(string entityName)
 
 		public IEntityPersister TryGetEntityPersister(string entityName)
 		{
+			CheckNotClosed();
 			IEntityPersister result;
 			entityPersisters.TryGetValue(entityName, out result);
 			return result;
 		}
 
 		public ICollectionPersister GetCollectionPersister(string role)
 		{
+			CheckNotClosed();
 			ICollectionPersister value;
 			if (collectionPersisters.TryGetValue(role, out value) == false)
 				throw new MappingException("Unknown collection role: " + role);
@@ -863,6 +872,14 @@ public void Dispose()
 			Close();
 		}
 
+		private void CheckNotClosed()
+		{
+			if (isClosed)
+			{
+				throw new ObjectDisposedException($"Session factory {Name} with id {Uuid}");
+			}
+		}
+
 		/// <summary>
 		/// Closes the session factory, releasing all held resources.
 		/// <list>
@@ -1105,6 +1122,7 @@ public UpdateTimestampsCache UpdateTimestampsCache
 		public IDictionary<string, ICache> GetAllSecondLevelCacheRegions()
 #pragma warning restore 618
 		{
+			CheckNotClosed();
 			return
 				_allCacheRegions
 					// ToArray creates a moment in time snapshot
@@ -1119,6 +1137,7 @@ public IDictionary<string, ICache> GetAllSecondLevelCacheRegions()
 		public ICache GetSecondLevelCacheRegion(string regionName)
 #pragma warning restore 618
 		{
+			CheckNotClosed();
 			_allCacheRegions.TryGetValue(regionName, out var result);
 			return result;
 		}
@@ -1145,7 +1164,12 @@ public IStatisticsImplementor StatisticsImplementor
 
 		public IQueryCache QueryCache
 		{
-			get { return queryCache; }
+			get
+			{
+				if (queryCache != null)
+					CheckNotClosed();
+				return queryCache;
+			}
 		}
 
 		public IQueryCache GetQueryCache(string cacheRegion)
@@ -1159,6 +1183,7 @@ public IQueryCache GetQueryCache(string cacheRegion)
 				return null;
 			}
 
+			CheckNotClosed();
 			// The factory may be run concurrently by threads trying to get the same region.
 			// But the GetOrAdd will yield the same lazy for all threads, so only one will
 			// initialize. https://stackoverflow.com/a/31637510/1178314
@@ -1175,6 +1200,7 @@ public void EvictQueries()
 			// NH Different implementation
 			if (queryCache != null)
 			{
+				CheckNotClosed();
 				queryCache.Clear();
 				if (queryCaches.Count == 0)
 				{
@@ -1193,6 +1219,7 @@ public void EvictQueries(string cacheRegion)
 			{
 				if (settings.IsQueryCacheEnabled)
 				{
+					CheckNotClosed();
 					if (queryCaches.TryGetValue(cacheRegion, out var currentQueryCache))
 					{
 						currentQueryCache.Value.Clear();