From 8d500e1ab6df416b09680189152afe1999e671f0 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Sat, 31 Jan 2015 00:11:39 +0000 Subject: [PATCH] changed shutdown to also called shutdownNow --- .../chronicle/map/AbstractChannelReplicator.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java index e02ea8388..b95bd5a01 100644 --- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java @@ -260,6 +260,19 @@ abstract class AbstractChannelReplicator implements Closeable { public void closeResources() { isClosed = true; executorService.shutdown(); + + + try { + executorService.awaitTermination(5, TimeUnit.MILLISECONDS); + } catch (Exception e) { + executorService.shutdownNow(); + try { + executorService.awaitTermination(10, TimeUnit.SECONDS); + } catch (InterruptedException e1) { + LOG.error("", e); + } + } + closeables.closeQuietly(); if (segmentState != null) segmentState.close();