From 31127bd9ddf0c54ccaf55cc49c924a2fec2be71b Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 13 Jan 2022 15:32:38 +0100 Subject: Replace use of Guava's UncheckedTimeoutException with our own --- vespajlib/src/main/java/com/yahoo/concurrent/Locks.java | 2 -- .../src/main/java/com/yahoo/concurrent/UncheckedTimeoutException.java | 2 ++ .../src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vespajlib/src/main/java/com/yahoo/concurrent') diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java b/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java index 44bcec4f0eb..7fa5ecfcdee 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent; -import com.google.common.util.concurrent.UncheckedTimeoutException; - import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/UncheckedTimeoutException.java b/vespajlib/src/main/java/com/yahoo/concurrent/UncheckedTimeoutException.java index e7d124f2288..b9fa0c6cb3c 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/UncheckedTimeoutException.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/UncheckedTimeoutException.java @@ -10,6 +10,8 @@ import java.util.concurrent.TimeoutException; */ public class UncheckedTimeoutException extends RuntimeException { + public UncheckedTimeoutException() {} + public UncheckedTimeoutException(TimeoutException cause) { super(cause.getMessage(), cause); } public UncheckedTimeoutException(String message) { super(message); } diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java index da22dbdc336..1edf8e4edbe 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent.maintenance; -import com.google.common.util.concurrent.UncheckedTimeoutException; +import com.yahoo.concurrent.UncheckedTimeoutException; import com.yahoo.net.HostName; import java.math.BigDecimal; -- cgit v1.2.3