From d7b112ebfcb4850622be677e26776c691969e106 Mon Sep 17 00:00:00 2001
From: Kindrat <legioner@pp-ua.org>
Date: Sun, 29 Nov 2015 01:05:19 +0200
Subject: [PATCH] Threat connection failure as ping failure

---
 .../org/redisson/connection/RedisClientEntry.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/redisson/connection/RedisClientEntry.java b/src/main/java/org/redisson/connection/RedisClientEntry.java
index c1c102d07..112ab541d 100644
--- a/src/main/java/org/redisson/connection/RedisClientEntry.java
+++ b/src/main/java/org/redisson/connection/RedisClientEntry.java
@@ -15,16 +15,14 @@
  */
 package org.redisson.connection;
 
-import java.net.InetSocketAddress;
-import java.util.Map;
-
-import org.redisson.MasterSlaveServersConfig;
+import io.netty.util.concurrent.Promise;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisConnection;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.core.ClusterNode;
 
-import io.netty.util.concurrent.Promise;
+import java.net.InetSocketAddress;
+import java.util.Map;
 
 public class RedisClientEntry implements ClusterNode {
 
@@ -56,13 +54,16 @@ public class RedisClientEntry implements ClusterNode {
 
     @Override
     public boolean ping() {
-        RedisConnection c = connect();
+        RedisConnection c = null;
         try {
+            c = connect();
             return "PONG".equals(c.sync(RedisCommands.PING));
         } catch (Exception e) {
             return false;
         } finally {
-            c.closeAsync();
+            if (c != null) {
+                c.closeAsync();
+            }
         }
     }