From fdce26784f66432904a3124bea68b9189cb128f4 Mon Sep 17 00:00:00 2001
From: Rival Abdrakhmanov <rival.abdrakhmanov@jetbrains.com>
Date: Fri, 5 Jan 2024 15:09:52 +0100
Subject: [PATCH] Fix possible nre

---
 gradle.properties                                         | 2 +-
 src/dotnet/aspire-session-host/Models.cs                  | 2 +-
 src/dotnet/aspire-session-host/Sessions/SessionService.cs | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1049d7ab..31cd0603 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ pluginGroup = me.rafaelldi.aspire
 pluginName = aspire-plugin
 pluginRepositoryUrl = https://github.com/rafaelldi/aspire-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.2.0
+pluginVersion = 0.2.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 233
diff --git a/src/dotnet/aspire-session-host/Models.cs b/src/dotnet/aspire-session-host/Models.cs
index 90869c06..4e6f0b1b 100644
--- a/src/dotnet/aspire-session-host/Models.cs
+++ b/src/dotnet/aspire-session-host/Models.cs
@@ -11,4 +11,4 @@ internal sealed record Session(
 );
 
 [UsedImplicitly]
-internal sealed record EnvironmentVariable(string Name, string Value);
\ No newline at end of file
+internal sealed record EnvironmentVariable(string Name, string? Value);
\ No newline at end of file
diff --git a/src/dotnet/aspire-session-host/Sessions/SessionService.cs b/src/dotnet/aspire-session-host/Sessions/SessionService.cs
index de1ae3f1..d9bb3122 100644
--- a/src/dotnet/aspire-session-host/Sessions/SessionService.cs
+++ b/src/dotnet/aspire-session-host/Sessions/SessionService.cs
@@ -13,11 +13,15 @@ internal sealed class SessionService(Connection connection, ILogger<SessionServi
         var id = Guid.NewGuid();
         var stringId = id.ToString();
         var serviceName = session.Env?.FirstOrDefault(it => it.Name == TelemetryServiceName);
+        var envs = session.Env
+            ?.Where(it => it.Value is not null)
+            ?.Select(it => new EnvironmentVariableModel(it.Name, it.Value!))
+            ?.ToArray();
         var sessionModel = new SessionModel(
             stringId,
             session.ProjectPath,
             session.Debug,
-            session.Env?.Select(it => new EnvironmentVariableModel(it.Name, it.Value)).ToArray(),
+            envs,
             session.Args,
             serviceName?.Value
         );