Merge branch 'master' of github.com:redisson/redisson

redisson/src/main/java/org/redisson/config/Config.java

@@ -441,6 +441,8 @@ public class Config {
      * all listeners of <code>RTopic</code>, 
      * <code>RRemoteService</code> invocation handlers  
      * and <code>RExecutorService</code> tasks.
+     * <p>
+     * The caller is responsible for closing the ExecutorService.
      * 
      * @param executor object
      * @return config
@@ -463,6 +465,8 @@ public class Config {
      * <p>
      * Only {@link io.netty.channel.epoll.EpollEventLoopGroup} or
      * {@link io.netty.channel.nio.NioEventLoopGroup} can be used.
+     * <p>
+     * The caller is responsible for closing the EventLoopGroup.
      *
      * @param eventLoopGroup object
      * @return config

redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java

@@ -147,6 +147,10 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
     
     private final AsyncSemaphore freePubSubLock = new AsyncSemaphore(1);
     
+    private final boolean sharedEventLoopGroup;
+
+    private final boolean sharedExecutor;
+    
     {
         for (int i = 0; i < locks.length; i++) {
             locks[i] = new AsyncSemaphore(1);
@@ -198,6 +202,8 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
        
         this.codec = cfg.getCodec();
         this.shutdownPromise = newPromise();
+        this.sharedEventLoopGroup = cfg.getEventLoopGroup() != null;
+        this.sharedExecutor = cfg.getExecutor() != null;
     }
 
     public boolean isClusterMode() {
@@ -740,13 +746,18 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
         }
         timer.stop();
         
-        executor.shutdown();
+        if (!sharedExecutor) {
-        try {
+            executor.shutdown();
-            executor.awaitTermination(timeout, unit);
+            try {
-        } catch (InterruptedException e) {
+                executor.awaitTermination(timeout, unit);
-            Thread.currentThread().interrupt();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        
+        if (!sharedEventLoopGroup) {
+            group.shutdownGracefully(quietPeriod, timeout, unit).syncUninterruptibly();
         }
-        group.shutdownGracefully(quietPeriod, timeout, unit).syncUninterruptibly();
     }
 
     @Override