Merge pull request #478 from Vlatombe/close-session-on-exception

If an exception occurs while launching an agent, the underlying connection and session should be closed

Author: basil

src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineComputerLauncher.java

@@ -280,10 +280,11 @@ private void launch(ComputeEngineComputer computer, TaskListener listener) {
             return;
         }
 
-        final Connection conn;
+        Connection conn = null;
         Optional<Connection> cleanupConn;
         PrintStream logger = listener.getLogger();
         logInfo(computer, listener, "Launching instance: " + node.getNodeName());
+        Session sess = null;
         try {
             cleanupConn = setupConnection(node, computer, listener);
             if (!cleanupConn.isPresent()) {
@@ -298,16 +299,24 @@ private void launch(ComputeEngineComputer computer, TaskListener listener) {
             copyAgentJar(computer, conn, listener, jenkinsDir);
             String launchString = getJavaLaunchString(javaExecPath, jenkinsDir);
             logInfo(computer, listener, "Launching Jenkins agent via plugin SSH: " + launchString);
-            final Session sess = conn.openSession();
+            sess = conn.openSession();
             sess.execCommand(launchString);
+            Session finalSess = sess;
+            Connection finalConn = conn;
             computer.setChannel(sess.getStdout(), sess.getStdin(), logger, new Channel.Listener() {
                 @Override
                 public void onClosed(Channel channel, IOException cause) {
-                    sess.close();
-                    conn.close();
+                    finalSess.close();
+                    finalConn.close();
                 }
             });
         } catch (Exception e) {
+            if (sess != null) {
+                sess.close();
+            }
+            if (conn != null) {
+                conn.close();
+            }
             logException(computer, listener, "Error: ", e);
         }
     }