From 3334dc487532ae7ac3cd2eca4d15e21b3e299519 Mon Sep 17 00:00:00 2001 From: Mike Jensen Date: Thu, 5 Sep 2019 08:55:49 -0600 Subject: [PATCH] 4.11 Release updating transitive threadly to 5.40 --- README.md | 2 +- gradle.properties | 4 ++-- .../threadly/litesockets/SocketExecuterCommonBase.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a4c4ccf..52d0f21 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Include the litesockets library into your project from maven central: org.threadly litesockets - 4.10 + 4.11 ``` diff --git a/gradle.properties b/gradle.properties index 65b1ed7..8cd0921 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group = org.threadly -version = 4.10 -threadlyVersion = 5.37 +version = 4.11 +threadlyVersion = 5.40 diff --git a/src/main/java/org/threadly/litesockets/SocketExecuterCommonBase.java b/src/main/java/org/threadly/litesockets/SocketExecuterCommonBase.java index 82ba5ee..75ac382 100644 --- a/src/main/java/org/threadly/litesockets/SocketExecuterCommonBase.java +++ b/src/main/java/org/threadly/litesockets/SocketExecuterCommonBase.java @@ -13,7 +13,7 @@ import org.threadly.concurrent.SubmitterScheduler; import org.threadly.concurrent.future.ListenableFuture; -import org.threadly.concurrent.future.WatchdogCache; +import org.threadly.concurrent.future.watchdog.MixedTimeWatchdog; import org.threadly.litesockets.utils.IOUtils; import org.threadly.litesockets.utils.SimpleByteStats; import org.threadly.util.AbstractService; @@ -29,7 +29,7 @@ abstract class SocketExecuterCommonBase extends AbstractService implements Socke protected final ConcurrentHashMap clients = new ConcurrentHashMap<>(); protected final ConcurrentHashMap servers = new ConcurrentHashMap<>(); protected final SocketExecuterByteStats stats = new SocketExecuterByteStats(); - protected final WatchdogCache dogCache; + protected final MixedTimeWatchdog dogCache; protected volatile boolean perConnectionStatsEnabled = true; protected Selector acceptSelector; @@ -43,7 +43,7 @@ abstract class SocketExecuterCommonBase extends AbstractService implements Socke ArgumentVerifier.assertNotNull(acceptScheduler, "Accept Scheduler"); schedulerPool = ssi; - dogCache = new WatchdogCache(ssi, true); + dogCache = new MixedTimeWatchdog(ssi, true); this.acceptScheduler = acceptScheduler; } @@ -188,7 +188,7 @@ public SimpleByteStats getStats() { @Override public void watchFuture(final ListenableFuture lf, final long delay) { - dogCache.watch(lf, delay); + dogCache.watch(delay, lf); } protected static Selector openSelector() {