diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-05-19 16:06:32 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-05-19 16:06:32 +0200 |
commit | 0b8987105250d81308c172816b5c41b13a135b24 (patch) | |
tree | 54e52ee2fc56b9cf857f4f671708e63ee8ace039 /documentapi | |
parent | 75eca8ab11fcd74e08b50f0076970a5c61f1c63a (diff) |
Avoid non-positive explicit timeouts in MessageBusVisitorSesssion
Diffstat (limited to 'documentapi')
-rwxr-xr-x | documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java index 248fcf7a624..f71fc54a302 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java @@ -968,7 +968,7 @@ public class MessageBusVisitorSession implements VisitorSession { } private long messageTimeoutMillis() { - return !isInfiniteTimeout(params.getTimeoutMs()) ? params.getTimeoutMs() : 5 * 60 * 1000; + return !isInfiniteTimeout(params.getTimeoutMs()) ? Math.max(1, params.getTimeoutMs()) : 5 * 60 * 1000; } private long sessionTimeoutMillis() { @@ -985,9 +985,10 @@ public class MessageBusVisitorSession implements VisitorSession { private long computeBoundedMessageTimeoutMillis(long elapsedMs) { final long messageTimeoutMillis = messageTimeoutMillis(); - return !isInfiniteTimeout(sessionTimeoutMillis()) - ? Math.min(sessionTimeoutMillis() - elapsedMs, messageTimeoutMillis) - : messageTimeoutMillis; + return ! isInfiniteTimeout(sessionTimeoutMillis()) + ? Math.min(Math.max(1, sessionTimeoutMillis() - elapsedMs), + messageTimeoutMillis) + : messageTimeoutMillis; } /** |