From a92dd2d4e455ed287aaadc21fe5089f2d5125aed Mon Sep 17 00:00:00 2001
From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com>
Date: Mon, 10 Dec 2018 16:26:57 -0800
Subject: [PATCH] Fix for PySpark3 not being selected by default (#3554)

---
 src/sql/parts/notebook/models/sparkMagicContexts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sql/parts/notebook/models/sparkMagicContexts.ts b/src/sql/parts/notebook/models/sparkMagicContexts.ts
index edffd5b70c..8753c64508 100644
--- a/src/sql/parts/notebook/models/sparkMagicContexts.ts
+++ b/src/sql/parts/notebook/models/sparkMagicContexts.ts
@@ -149,10 +149,10 @@ export class SparkMagicContexts {
 			}
 		}
 		let profile = connectionInfo as IConnectionProfile;
-		if (foundSavedKernelInSpecs && specs && connectionInfo && profile.providerName === notebookConstants.hadoopKnoxProviderName) {
+		if (specs && connectionInfo && profile.providerName === notebookConstants.hadoopKnoxProviderName) {
 			// set default kernel to default spark kernel if profile exists
 			// otherwise, set default to kernel info loaded from existing file
-			defaultKernel = !savedKernelInfo ? specs.kernels.find((spec) => spec.name === notebookConstants.defaultSparkKernel) : savedKernelInfo;
+			defaultKernel = !foundSavedKernelInSpecs ? specs.kernels.find((spec) => spec.name === notebookConstants.defaultSparkKernel) : foundSavedKernelInSpecs;
 		} else {
 			// Handle kernels
 			if (savedKernelInfo && savedKernelInfo.name.toLowerCase().indexOf('spark') > -1) {