Bugfix for Microsoft.Spark.Extensions.DotNet.Interactive duplicate file exception (#565)

suhsteve · web-flow · commit 0879fd1a7a6d · 2020-06-23T14:23:37.000-07:00
diff --git a/src/csharp/Extensions/Microsoft.Spark.Extensions.DotNet.Interactive/AssemblyKernelExtension.cs b/src/csharp/Extensions/Microsoft.Spark.Extensions.DotNet.Interactive/AssemblyKernelExtension.cs
@@ -45,6 +45,8 @@ public Task OnLoadAsync(IKernel kernel)
 
                 kernelBase.AddMiddleware(async (command, context, next) =>
                 {
+                    await next(command, context);
+
                     if ((context.HandlingKernel is CSharpKernel kernel) &&
                         (command is SubmitCode) &&
                         TryGetSparkSession(out SparkSession sparkSession) &&
@@ -57,8 +59,6 @@ public Task OnLoadAsync(IKernel kernel)
                             sparkSession.SparkContext.AddFile(filePath);
                         }
                     }
-
-                    await next(command, context);
                 });
             }
 

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ public Task OnLoadAsync(IKernel kernel)`
`45`	`45`
`46`	`46`	`kernelBase.AddMiddleware(async (command, context, next) =>`
`47`	`47`	`{`
	`48`	`+ await next(command, context);`
	`49`	`+`
`48`	`50`	`if ((context.HandlingKernel is CSharpKernel kernel) &&`
`49`	`51`	`(command is SubmitCode) &&`
`50`	`52`	`TryGetSparkSession(out SparkSession sparkSession) &&`
`@@ -57,8 +59,6 @@ public Task OnLoadAsync(IKernel kernel)`
`57`	`59`	`sparkSession.SparkContext.AddFile(filePath);`
`58`	`60`	`}`
`59`	`61`	`}`
`60`		`-`
`61`		`- await next(command, context);`
`62`	`62`	`});`
`63`	`63`	`}`
`64`	`64`