From 23cd95154ce7574827ba8f0bb8138036e4fa5c4b Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 9 Sep 2016 15:36:35 +0200 Subject: [PATCH] =?UTF-8?q?make=20new=20kotlin=20version=20happy=20?= =?UTF-8?q?=E2=80=94=20cleanup=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform-impl/src/com/intellij/util/io/netty.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/util/io/netty.kt b/platform/platform-impl/src/com/intellij/util/io/netty.kt index c12bfcd981d2..1e2de21ab30a 100644 --- a/platform/platform-impl/src/com/intellij/util/io/netty.kt +++ b/platform/platform-impl/src/com/intellij/util/io/netty.kt @@ -117,12 +117,11 @@ private fun doConnect(bootstrap: Bootstrap, bootstrap.validate() - val socket: Socket while (true) { try { - //noinspection IOResourceOpenedButNotSafelyClosed,SocketOpenedButNotSafelyClosed - socket = Socket(remoteAddress.address, remoteAddress.port) - break + val channel = OioSocketChannel(Socket(remoteAddress.address, remoteAddress.port)) + BootstrapUtil.initAndRegister(channel, bootstrap).sync() + return channel } catch (e: IOException) { if (stopCondition.value(null) || promise != null && promise.state != Promise.State.PENDING) { @@ -144,12 +143,7 @@ private fun doConnect(bootstrap: Bootstrap, return null } } - } - - val channel = OioSocketChannel(socket) - BootstrapUtil.initAndRegister(channel, bootstrap).sync() - return channel } private fun connectNio(bootstrap: Bootstrap,