Move more lines into try

halter73 · halter73 · commit a9a4b8e6e5b5 · 2025-04-06T18:59:02.000-07:00
diff --git a/src/ModelContextProtocol.AspNetCore/McpEndpointRouteBuilderExtensions.cs b/src/ModelContextProtocol.AspNetCore/McpEndpointRouteBuilderExtensions.cs
@@ -91,12 +91,12 @@ public static IEndpointConventionBuilder MapMcp(this IEndpointRouteBuilder endpo
             try
             {
                 var transportTask = transport.RunAsync(cancellationToken);
-                await using var mcpServer = McpServerFactory.Create(transport, options, loggerFactory, endpoints.ServiceProvider);
-
-                context.Features.Set(mcpServer);
 
                 try
                 {
+                    await using var mcpServer = McpServerFactory.Create(transport, options, loggerFactory, endpoints.ServiceProvider);
+                    context.Features.Set(mcpServer);
+
                     runSessionAsync ??= RunSession;
                     await runSessionAsync(context, mcpServer, cancellationToken);
                 }

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,12 @@ public static IEndpointConventionBuilder MapMcp(this IEndpointRouteBuilder endpo`
`91`	`91`	`try`
`92`	`92`	`{`
`93`	`93`	`var transportTask = transport.RunAsync(cancellationToken);`
`94`		`- await using var mcpServer = McpServerFactory.Create(transport, options, loggerFactory, endpoints.ServiceProvider);`
`95`		`-`
`96`		`- context.Features.Set(mcpServer);`
`97`	`94`
`98`	`95`	`try`
`99`	`96`	`{`
	`97`	`+ await using var mcpServer = McpServerFactory.Create(transport, options, loggerFactory, endpoints.ServiceProvider);`
	`98`	`+ context.Features.Set(mcpServer);`
	`99`	`+`
`100`	`100`	`runSessionAsync ??= RunSession;`
`101`	`101`	`await runSessionAsync(context, mcpServer, cancellationToken);`
`102`	`102`	`}`