Simplify code

shana · shana · commit db661268ab3f · 2017-06-12T13:20:40.000+02:00
diff --git a/src/GitHub.Api/NewTaskSystem/TaskExtensions.cs b/src/GitHub.Api/NewTaskSystem/TaskExtensions.cs
@@ -20,10 +20,9 @@ public static async Task SafeAwait(this Task source, Action<Exception> handler =
             catch (Exception ex)
             {
                 Logging.GetLogger().Error(ex);
-                if (handler != null)
-                    handler(ex);
-                else
+                if (handler == null)
                     throw;
+                handler(ex);
             }
         }
 
@@ -36,9 +35,9 @@ public static async Task<T> SafeAwait<T>(this Task<T> source, Func<Exception, T>
             catch (Exception ex)
             {
                 Logging.GetLogger().Error(ex);
-                if (handler != null)
-                    return handler(ex);
-                throw;
+                if (handler == null)
+                    throw;
+                return handler(ex);
             }
         }
 
@@ -51,10 +50,9 @@ public static async Task StartAwait(this ITask source, Action<Exception> handler
             catch (Exception ex)
             {
                 Logging.GetLogger().Error(ex);
-                if (handler != null)
-                    handler(ex);
-                else
+                if (handler == null)
                     throw;
+                handler(ex);
             }
         }
 
@@ -67,9 +65,9 @@ public static async Task<T> StartAwait<T>(this ITask<T> source, Func<Exception,
             catch (Exception ex)
             {
                 Logging.GetLogger().Error(ex);
-                if (handler != null)
-                    return handler(ex);
-                throw;
+                if (handler == null)
+                    throw;
+                return handler(ex);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,9 @@ public static async Task SafeAwait(this Task source, Action<Exception> handler =`
`20`	`20`	`catch (Exception ex)`
`21`	`21`	`{`
`22`	`22`	`Logging.GetLogger().Error(ex);`
`23`		`- if (handler != null)`
`24`		`- handler(ex);`
`25`		`- else`
	`23`	`+ if (handler == null)`
`26`	`24`	`throw;`
	`25`	`+ handler(ex);`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`
`@@ -36,9 +35,9 @@ public static async Task<T> SafeAwait<T>(this Task<T> source, Func<Exception, T>`
`36`	`35`	`catch (Exception ex)`
`37`	`36`	`{`
`38`	`37`	`Logging.GetLogger().Error(ex);`
`39`		`- if (handler != null)`
`40`		`- return handler(ex);`
`41`		`- throw;`
	`38`	`+ if (handler == null)`
	`39`	`+ throw;`
	`40`	`+ return handler(ex);`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`
`@@ -51,10 +50,9 @@ public static async Task StartAwait(this ITask source, Action<Exception> handler`
`51`	`50`	`catch (Exception ex)`
`52`	`51`	`{`
`53`	`52`	`Logging.GetLogger().Error(ex);`
`54`		`- if (handler != null)`
`55`		`- handler(ex);`
`56`		`- else`
	`53`	`+ if (handler == null)`
`57`	`54`	`throw;`
	`55`	`+ handler(ex);`
`58`	`56`	`}`
`59`	`57`	`}`
`60`	`58`
`@@ -67,9 +65,9 @@ public static async Task<T> StartAwait<T>(this ITask<T> source, Func<Exception,`
`67`	`65`	`catch (Exception ex)`
`68`	`66`	`{`
`69`	`67`	`Logging.GetLogger().Error(ex);`
`70`		`- if (handler != null)`
`71`		`- return handler(ex);`
`72`		`- throw;`
	`68`	`+ if (handler == null)`
	`69`	`+ throw;`
	`70`	`+ return handler(ex);`
`73`	`71`	`}`
`74`	`72`	`}`
`75`	`73`