summaryrefslogtreecommitdiffstats
path: root/zkfacade
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-02-14 09:50:28 +0100
committerjonmv <venstad@gmail.com>2023-02-14 09:50:28 +0100
commitb77f19bedcda698065b34a0c4eb19503ec93f8fa (patch)
tree0d9581a9be2780cba715d02e682f64bac51b47f2 /zkfacade
parenta8a9d7fde0b9c94f42ab205835b433311157c2f0 (diff)
Unify catch-and-log branches
Diffstat (limited to 'zkfacade')
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
index 079641f0068..e37d561ca1b 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
@@ -157,11 +157,8 @@ class SingletonManager {
logger.log(INFO, "Relinquishing lease for " + id);
lock.close();
}
- catch (IllegalMonitorStateException e) {
- logger.log(WARNING, "Failed closing " + lock + ", already closed", e);
- }
catch (Exception e) {
- logger.log(WARNING, "Failed closing " + lock + ", will let it expire", e);
+ logger.log(WARNING, "Failed closing " + lock, e);
}
doom.set(EMPTY);
lock = null;