Prevent NPE if Windows agent private key credential ID is not set

jenkinsci · Feb 25, 2021 · 2bf77a4 · 2bf77a4
1 parent 9efad89
commit 2bf77a4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineWindowsLauncher.java b/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineWindowsLauncher.java
@@ -69,7 +69,8 @@ public static boolean authenticateSSH(
       TaskListener listener)
       throws Exception {
     boolean isAuthenticated;
-    if (!windowsConfig.getPrivateKeyCredentialsId().isEmpty()) {
+    if (windowsConfig.getPrivateKeyCredentialsId() != null
+        && !windowsConfig.getPrivateKeyCredentialsId().isEmpty()) {
       isAuthenticated =
           SSHAuthenticator.newInstance(
                   sshConnection, windowsConfig.getPrivateKeyCredentials(), windowsUsername)