A TaskCanceledException is a timeout and should always translate to a…

… ServerUnavailableException Resolves Issue #112
AutomatedArchitecture · Jan 24, 2018 · f45a16a · f45a16a
1 parent 0e9ef18
commit f45a16a
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/TfsRestServices/TfsRestWatcher.cs b/TfsRestServices/TfsRestWatcher.cs
@@ -46,11 +46,6 @@ protected override IList<BuildStatus> GetBuildStatus()
                     throw new ServerUnavailableException();
                 }
 
-                var taskCancelledException = ex.InnerExceptions.FirstOrDefault(x => x is TaskCanceledException);
-                if (!ReferenceEquals(null, taskCancelledException))
-                {
-                    throw taskCancelledException;
-                }
                 throw;
             }
             catch (WebException ex)
@@ -75,6 +70,8 @@ private static bool IsInvalidCredentials(Exception ex)
 
         private static bool IsServerUnavailable(Exception ex)
         {
+            if (ex is TaskCanceledException)
+                return true;
             if (ex is WebException webException)
                 return IsServerUnavailable(webException);
             if (ex is HttpRequestException httpRequestException)