fixup! Initialize collections on demand

Author: hazzik

src/NHibernate/Action/BulkOperationCleanupAction.cs

@@ -66,8 +66,6 @@ public BulkOperationCleanupAction(ISessionImplementor session, ISet<string> quer
 		{
 			//from H3.2 TODO: cache the autodetected information and pass it in instead.
 			_factory = session.Factory;
-			_affectedEntityNames = new HashSet<string>();
-			_affectedCollectionRoles = new HashSet<string>();
 
 			var tmpSpaces = new HashSet<string>(querySpaces);
 			var acmd = _factory.GetAllClassMetadata();
@@ -157,15 +155,15 @@ public void ExecuteAfterTransactionCompletion(bool success)
 
 		private void EvictCollectionRegions()
 		{
-			if (_affectedCollectionRoles != null && _affectedCollectionRoles.Any())
+			if (_affectedCollectionRoles != null)
 			{
 				_factory.EvictCollection(_affectedCollectionRoles);
 			}
 		}
 
 		private void EvictEntityRegions()
 		{
-			if (_affectedEntityNames != null && _affectedEntityNames.Any())
+			if (_affectedEntityNames != null)
 			{
 				_factory.EvictEntity(_affectedEntityNames);
 			}

src/NHibernate/Async/Action/BulkOperationCleanupAction.cs

@@ -75,18 +75,11 @@ private Task EvictCollectionRegionsAsync(CancellationToken cancellationToken)
 			{
 				return Task.FromCanceled<object>(cancellationToken);
 			}
-			try
-			{
-				if (_affectedCollectionRoles != null && _affectedCollectionRoles.Any())
-				{
-					return _factory.EvictCollectionAsync(_affectedCollectionRoles, cancellationToken);
-				}
-				return Task.CompletedTask;
-			}
-			catch (Exception ex)
+			if (_affectedCollectionRoles != null)
 			{
-				return Task.FromException<object>(ex);
+				return _factory.EvictCollectionAsync(_affectedCollectionRoles, cancellationToken);
 			}
+			return Task.CompletedTask;
 		}
 
 		private Task EvictEntityRegionsAsync(CancellationToken cancellationToken)
@@ -95,18 +88,11 @@ private Task EvictEntityRegionsAsync(CancellationToken cancellationToken)
 			{
 				return Task.FromCanceled<object>(cancellationToken);
 			}
-			try
-			{
-				if (_affectedEntityNames != null && _affectedEntityNames.Any())
-				{
-					return _factory.EvictEntityAsync(_affectedEntityNames, cancellationToken);
-				}
-				return Task.CompletedTask;
-			}
-			catch (Exception ex)
+			if (_affectedEntityNames != null)
 			{
-				return Task.FromException<object>(ex);
+				return _factory.EvictEntityAsync(_affectedEntityNames, cancellationToken);
 			}
+			return Task.CompletedTask;
 		}
 
 		#endregion