From 478b10d3918d6652e044a1611f96ec120a37cfd0 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com> Date: Wed, 31 May 2023 16:38:52 -0700 Subject: [PATCH] Handles a null reference exception (#2079) --- .../ObjectExplorer/SqlServerType.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SqlServerType.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SqlServerType.cs index 62cff3aa..a1b2a457 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SqlServerType.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SqlServerType.cs @@ -42,10 +42,14 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer /// public static ValidForFlag GetValidForFlag(SqlServerType serverType, Database database = null) { - var isSqlDw = false; + bool isSqlDw = false; try { - isSqlDw = database.IsSqlDw; + // Database could be null here, handle NRE first. + if (database != null) + { + isSqlDw = database.IsSqlDw; + } } catch (Exception e) { @@ -54,7 +58,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer Logger.Information($"This exception is expected when we are trying to access a readonly database. Exception: {e.Message}"); } - return GetValidForFlag(serverType, database != null && isSqlDw); + return GetValidForFlag(serverType, isSqlDw); } ///