From 5606e7d264d349105a6ff99df38b488161fe278d Mon Sep 17 00:00:00 2001
From: Rob Austin <rob.austin@boundedbuffer.co.uk>
Date: Mon, 2 Feb 2015 09:52:37 +0000
Subject: [PATCH] ignore java.util.concurrent.RejectedExecutionException when
 already closed

---
 .../map/AbstractChannelReplicator.java        | 72 ++++++++++---------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
index c2bc4d3cb..649ccc750 100644
--- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
@@ -605,49 +605,53 @@ abstract class AbstractChannelReplicator implements Closeable {
          * @param reconnectionInterval the period to wait before connecting
          */
         private void doConnect(final long reconnectionInterval) {
-
-            connectExecutorService.submit(new Runnable() {
-                public void run() {
-                    SelectableChannel socketChannel = null;
-                    try {
-                        if (reconnectionInterval > 0)
-                            Thread.sleep(reconnectionInterval);
-
-                        socketChannel = doConnect();
-
+            try {
+                connectExecutorService.submit(new Runnable() {
+                    public void run() {
+                        SelectableChannel socketChannel = null;
                         try {
-                            closeables.add(socketChannel);
-                        } catch (IllegalStateException e) {
-                            // close could have be called from another thread, while we were in Thread.sleep()
-                            // which would cause a IllegalStateException
+                            if (reconnectionInterval > 0)
+                                Thread.sleep(reconnectionInterval);
+
+                            socketChannel = doConnect();
+
+                            try {
+                                closeables.add(socketChannel);
+                            } catch (IllegalStateException e) {
+                                // close could have be called from another thread, while we were in Thread.sleep()
+                                // which would cause a IllegalStateException
+                                closeQuietly(socketChannel);
+                                return;
+                            }
+
+                            AbstractConnector.this.socketChannel = socketChannel;
+                        } catch (Exception e) {
                             closeQuietly(socketChannel);
-                            return;
+                            LOG.debug("", e);
                         }
-
-                        AbstractConnector.this.socketChannel = socketChannel;
-                    } catch (Exception e) {
-                        closeQuietly(socketChannel);
-                        LOG.debug("", e);
                     }
-                }
-
-                private void closeQuietly(SelectableChannel socketChannel) {
-                    if (socketChannel == null)
-                        return;
-                    try {
-                        socketChannel.close();
-                    } catch (Exception e1) {
-                        // do nothing
-                    }
-                }
-            });
-
-
+                });
+            } catch (Exception e) {
+                if (!isClosed)
+                    LOG.error("", e);
+            }
         }
 
+        private void closeQuietly(SelectableChannel socketChannel) {
+            if (socketChannel == null)
+                return;
+            try {
+                socketChannel.close();
+            } catch (Exception e1) {
+                // do nothing
+            }
+        }
+
+
         public void setSuccessfullyConnected() {
             connectionAttempts = 0;
         }
+
     }
 
 }