Use only one try block

microsoft · Mar 14, 2024 · 6850ec2 · 6850ec2
1 parent 9b07e63
commit 6850ec2
Showing 1 changed file with 10 additions and 21 deletions.
diff --git a/src/Sarif.Driver/OrderedFileSpecifier.cs b/src/Sarif.Driver/OrderedFileSpecifier.cs
@@ -87,35 +87,24 @@ private IEnumerable<IEnumeratedArtifact> EnumeratedArtifacts()
 
             Task directoryEnumerationTask;
 
-            if (this.recurse)
+            directoryEnumerationTask = Task.Run(() =>
             {
-                directoryEnumerationTask = Task.Run(() =>
+                try
                 {
-                    try
+                    if (this.recurse)
                     {
                         EnqueueAllFilesUnderDirectory(directory, filesToProcessChannel.Writer, filter, new SortedSet<string>(StringComparer.Ordinal));
                     }
-                    finally
-                    {
-                        filesToProcessChannel.Writer.Complete();
-                    }
-                });
-            }
-            else
-            {
-                directoryEnumerationTask = Task.Run(() =>
-                {
-                    try
+                    else
                     {
                         WriteFilesInDirectoryToChannel(directory, filesToProcessChannel, filter, new SortedSet<string>(StringComparer.Ordinal));
                     }
-                    finally
-                    {
-                        filesToProcessChannel.Writer.Complete();
-                        directoryEnumerationTask = Task.CompletedTask;
-                    }
-                });
-            }
+                }
+                finally
+                {
+                    filesToProcessChannel.Writer.Complete();
+                }
+            });
 
             ChannelReader<string> reader = filesToProcessChannel.Reader;
             while (!reader.Completion.IsCompleted)