Always disposing context

microsoft · Mar 1, 2021 · 47644bd · 47644bd
1 parent 44f0dff
commit 47644bd
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/Sarif.Driver/Sdk/MultithreadedAnalyzeCommandBase.cs b/src/Sarif.Driver/Sdk/MultithreadedAnalyzeCommandBase.cs
@@ -227,12 +227,14 @@ private async Task<bool> WriteResultsAsync(TContext rootContext)
                     // processed, we just ignore this notification.
                     if (currentIndex > item) { break; }
 
-                    TContext context;
+                    TContext context = default;
+                    bool didAnalyze;
                     try
                     {
                         context = _fileContexts[currentIndex];
+                        didAnalyze = false;
 
-                        while (context?.AnalysisComplete == true)
+                        while (context?.AnalysisComplete == true && !didAnalyze)
                         {
                             var cachingLogger = (CachingLogger)context.Logger;
                             IDictionary<ReportingDescriptor, IList<Result>> results = cachingLogger.Results;
@@ -277,22 +279,20 @@ private async Task<bool> WriteResultsAsync(TContext rootContext)
 
                             RuntimeErrors |= context.RuntimeErrors;
 
-                            context.Dispose();
                             _fileContexts[currentIndex] = default;
-
-                            context = currentIndex < (_fileContexts.Count - 1)
-                                ? context = _fileContexts[currentIndex + 1]
-                                : default;
-
                             currentIndex++;
+                            didAnalyze = true;
                         }
                     }
                     catch (Exception e)
                     {
-                        context = default;
                         RuntimeErrors |= Errors.LogUnhandledEngineException(rootContext, e);
                         ThrowExitApplicationException(context, ExitReason.ExceptionWritingToLogFile, e);
                     }
+                    finally
+                    {
+                        context?.Dispose();
+                    }
                 }
             }