From 6c5abe9831b17142f1e0c864c03fa0dfd7623597 Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Date: Fri, 11 Nov 2016 14:08:18 +0300
Subject: [PATCH] PY-21264 Simplify the code, get rid of the success variable

---
 .../pydev/transport/ClientModeDebuggerTransport.java  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/transport/ClientModeDebuggerTransport.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/transport/ClientModeDebuggerTransport.java
index 6dae25c356e8..abf46f6fa114 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/transport/ClientModeDebuggerTransport.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/transport/ClientModeDebuggerTransport.java
@@ -17,7 +17,6 @@ import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * {@link DebuggerTransport} implementation that expects a debugging script to behave as a server. The main process of the debugging script
@@ -122,22 +121,21 @@ public class ClientModeDebuggerTransport extends BaseDebuggerTransport {
           throw e;
         }
 
-        AtomicBoolean success = new AtomicBoolean(false);
         CountDownLatch beforeHandshake = new CountDownLatch(1);
-        Future<Void> future = ApplicationManager.getApplication().executeOnPooledThread(() -> {
+        Future<Boolean> future = ApplicationManager.getApplication().executeOnPooledThread(() -> {
           beforeHandshake.countDown();
           try {
             myDebugger.handshake();
-            success.set(true);
+            return true;
           }
           catch (PyDebuggerException e) {
             LOG.debug(String.format("[%d] Handshake failed: #%d attempt", hashCode(), attempt));
+            return false;
           }
-          return null;
         });
         try {
           beforeHandshake.await();
-          future.get(CHECK_CONNECTION_APPROVED_DELAY, TimeUnit.MILLISECONDS);
+          connected = future.get(CHECK_CONNECTION_APPROVED_DELAY, TimeUnit.MILLISECONDS);
         }
         catch (InterruptedException e) {
           LOG.debug(String.format("[%d] Waiting for handshake interrupted: #%d attempt", hashCode(), attempt), e);
@@ -152,7 +150,6 @@ public class ClientModeDebuggerTransport extends BaseDebuggerTransport {
           future.cancel(true);
         }
 
-        connected = success.get();
         if (!connected) {
           myDebuggerReader.close();
           try {