From 3ae268e5e9c4715df0ccf9832b796bdf846fee08 Mon Sep 17 00:00:00 2001 From: leventov Date: Wed, 1 Jul 2015 16:31:36 +0300 Subject: [PATCH] Revert AbstractChannelReplicator logic change --- .../openhft/chronicle/map/AbstractChannelReplicator.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java index e30cf5345..3336cac90 100644 --- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java @@ -259,14 +259,7 @@ abstract class AbstractChannelReplicator implements Closeable { executorService.shutdown(); try { - if (!executorService.awaitTermination(5, TimeUnit.MILLISECONDS)) { - executorService.shutdownNow(); - try { - executorService.awaitTermination(10, TimeUnit.SECONDS); - } catch (InterruptedException e) { - LOG.error("", e); - } - } + executorService.awaitTermination(5, TimeUnit.MILLISECONDS); } catch (Exception e) { executorService.shutdownNow(); try {