Do additional cleanup

fredericDelaporte · fredericDelaporte · commit 8db66bb5eda9 · 2018-11-23T16:43:31.000+01:00
diff --git a/src/NHibernate/Async/Cache/NonstrictReadWriteCache.cs b/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);
 			}
diff --git a/src/NHibernate/Async/Cache/ReadWriteCache.cs b/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);
 			}
diff --git a/src/NHibernate/Cache/CacheFactory.cs b/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;
 		}
 
diff --git a/src/NHibernate/Cache/NonstrictReadWriteCache.cs b/src/NHibernate/Cache/NonstrictReadWriteCache.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/NHibernate/Cache/ReadWriteCache.cs b/src/NHibernate/Cache/ReadWriteCache.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`//------------------------------------------------------------------------------`
`9`	`9`
`10`	`10`
`11`		`-using System;`
`12`	`11`	`using System.Collections;`
`13`	`12`	`using System.Collections.Generic;`
`14`	`13`	`using System.Linq;`
`@@ -169,7 +168,7 @@ public Task<ISoftLock> LockAsync(CacheKey key, object version, CancellationToken`
`169`	`168`	`{`
`170`	`169`	`return Task.FromResult<ISoftLock>(Lock(key, version));`
`171`	`170`	`}`
`172`		`- catch (Exception ex)`
	`171`	`+ catch (System.Exception ex)`
`173`	`172`	`{`
`174`	`173`	`return Task.FromException<ISoftLock>(ex);`
`175`	`174`	`}`
`@@ -189,7 +188,7 @@ public Task RemoveAsync(CacheKey key, CancellationToken cancellationToken)`
`189`	`188`	`}`
`190`	`189`	`return Cache.RemoveAsync(key, cancellationToken);`
`191`	`190`	`}`
`192`		`- catch (Exception ex)`
	`191`	`+ catch (System.Exception ex)`
`193`	`192`	`{`
`194`	`193`	`return Task.FromException<object>(ex);`
`195`	`194`	`}`
`@@ -209,7 +208,7 @@ public Task ClearAsync(CancellationToken cancellationToken)`
`209`	`208`	`}`
`210`	`209`	`return Cache.ClearAsync(cancellationToken);`
`211`	`210`	`}`
`212`		`- catch (Exception ex)`
	`211`	`+ catch (System.Exception ex)`
`213`	`212`	`{`
`214`	`213`	`return Task.FromException<object>(ex);`
`215`	`214`	`}`
`@@ -232,7 +231,7 @@ public Task EvictAsync(CacheKey key, CancellationToken cancellationToken)`
`232`	`231`	`}`
`233`	`232`	`return Cache.RemoveAsync(key, cancellationToken);`
`234`	`233`	`}`
`235`		`- catch (Exception ex)`
	`234`	`+ catch (System.Exception ex)`
`236`	`235`	`{`
`237`	`236`	`return Task.FromException<object>(ex);`
`238`	`237`	`}`
`@@ -266,7 +265,7 @@ public Task ReleaseAsync(CacheKey key, ISoftLock @lock, CancellationToken cancel`
`266`	`265`
`267`	`266`	`return Cache.RemoveAsync(key, cancellationToken);`
`268`	`267`	`}`
`269`		`- catch (Exception ex)`
	`268`	`+ catch (System.Exception ex)`
`270`	`269`	`{`
`271`	`270`	`return Task.FromException<object>(ex);`
`272`	`271`	`}`
`@@ -295,7 +294,7 @@ public Task<bool> AfterInsertAsync(CacheKey key, object value, object version, C`
`295`	`294`	`{`
`296`	`295`	`return Task.FromResult<bool>(AfterInsert(key, value, version));`
`297`	`296`	`}`
`298`		`- catch (Exception ex)`
	`297`	`+ catch (System.Exception ex)`
`299`	`298`	`{`
`300`	`299`	`return Task.FromException<bool>(ex);`
`301`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`		`-using NHibernate.Cfg;`
`3`	`2`	`using System.Collections.Generic;`
	`3`	`+using NHibernate.Cfg;`
`4`	`4`
`5`	`5`	`namespace NHibernate.Cache`
`6`	`6`	`{`
`@@ -47,7 +47,7 @@ public static ICacheConcurrencyStrategy CreateCache(`
`47`	`47`
`48`	`48`	`if (mutable && usage == ReadOnly)`
`49`	`49`	`log.Warn("read-only cache configured for mutable: {0}", name);`
`50`		`-`
	`50`	`+`
`51`	`51`	`return ccs;`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using System.Collections;`
`3`	`2`	`using System.Collections.Generic;`
`4`	`3`	`using System.Linq;`