Merge branch 'master' into 2.2.0

README.md

@@ -76,6 +76,11 @@ Recent Releases
 ================================
 ####Please Note: trunk is current development branch.
 
+####30-Nov-2015 - version 2.1.6 released  
+Fixed - connection pool regression bug  
+Fixed - connection init during `Node.ping` and `ClusterNode.info` invocation  
+
+
 ####24-Nov-2015 - version 2.1.5 released  
 Feature - new methods with `limit` option support were added to `RLexSortedSet`: `lexRange`, `lexRangeHead`, `lexRangeHeadAsync`, `lexRangeTail`, `lexRangeTailAsync`, `lexRangeAsync` (thanks to jackygurui)  
 Feature - new methods with `limit` option support were added to `RScoredSortedSet`: `valueRange`, `valueRangeAsync`, `entryRange`, `entryRangeAsync`, `valueRange`, `valueRangeAsync` (thanks to jackygurui)  

src/main/java/org/redisson/client/handler/ConnectionWatchdog.java

@@ -76,16 +76,12 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
     }
 
     private void tryReconnect(final EventLoopGroup group, final RedisConnection connection, final int attempts) {
-        if (connection.isClosed()) {
+        if (connection.isClosed() || group.isShuttingDown()) {
             return;
         }
 
         log.debug("reconnecting {} to {} ", connection, connection.getRedisClient().getAddr(), connection);
 
-        if (bootstrap.group().isShuttingDown()) {
-            return;
-        }
-
         bootstrap.connect().addListener(new ChannelFutureListener() {
 
             @Override
@@ -112,8 +108,6 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
                     }
                 }, timeout, TimeUnit.MILLISECONDS);
             }
-
-
         });
     }