Do additional cleanup

Author: fredericDelaporte

src/NHibernate/Async/Cache/NonstrictReadWriteCache.cs

@@ -8,7 +8,6 @@
 //------------------------------------------------------------------------------
 
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -169,7 +168,7 @@ public Task<ISoftLock> LockAsync(CacheKey key, object version, CancellationToken
 			{
 				return Task.FromResult<ISoftLock>(Lock(key, version));
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<ISoftLock>(ex);
 			}
@@ -189,7 +188,7 @@ public Task RemoveAsync(CacheKey key, CancellationToken cancellationToken)
 				}
 				return Cache.RemoveAsync(key, cancellationToken);
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
@@ -209,7 +208,7 @@ public Task ClearAsync(CancellationToken cancellationToken)
 				}
 				return Cache.ClearAsync(cancellationToken);
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
@@ -232,7 +231,7 @@ public Task EvictAsync(CacheKey key, CancellationToken cancellationToken)
 				}
 				return Cache.RemoveAsync(key, cancellationToken);
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
@@ -266,7 +265,7 @@ public Task ReleaseAsync(CacheKey key, ISoftLock @lock, CancellationToken cancel
 
 				return Cache.RemoveAsync(key, cancellationToken);
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
@@ -295,7 +294,7 @@ public Task<bool> AfterInsertAsync(CacheKey key, object value, object version, C
 			{
 				return Task.FromResult<bool>(AfterInsert(key, value, version));
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<bool>(ex);
 			}

src/NHibernate/Async/Cache/ReadWriteCache.cs

@@ -8,7 +8,6 @@
 //------------------------------------------------------------------------------
 
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -317,7 +316,7 @@ private Task DecrementLockAsync(object key, CacheLock @lock, CancellationToken c
 				@lock.Unlock(Cache.NextTimestamp());
 				return Cache.PutAsync(key, @lock, cancellationToken);
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
@@ -368,7 +367,7 @@ internal Task HandleLockExpiryAsync(object key, CancellationToken cancellationTo
 				@lock.Unlock(ts);
 				return Cache.PutAsync(key, @lock, cancellationToken);
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
@@ -490,7 +489,7 @@ public Task EvictAsync(CacheKey key, CancellationToken cancellationToken)
 				Evict(key);
 				return Task.CompletedTask;
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
@@ -506,7 +505,7 @@ public Task<bool> UpdateAsync(CacheKey key, object value, object currentVersion,
 			{
 				return Task.FromResult<bool>(Update(key, value, currentVersion, previousVersion));
 			}
-			catch (Exception ex)
+			catch (System.Exception ex)
 			{
 				return Task.FromException<bool>(ex);
 			}

src/NHibernate/Cache/CacheFactory.cs

@@ -1,6 +1,6 @@
 using System;
-using NHibernate.Cfg;
 using System.Collections.Generic;
+using NHibernate.Cfg;
 
 namespace NHibernate.Cache
 {
@@ -47,7 +47,7 @@ public static ICacheConcurrencyStrategy CreateCache(
 
 			if (mutable && usage == ReadOnly)
 				log.Warn("read-only cache configured for mutable: {0}", name);
-			
+
 			return ccs;
 		}
 

src/NHibernate/Cache/NonstrictReadWriteCache.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

src/NHibernate/Cache/ReadWriteCache.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;