Avoid non-positive explicit timeouts in MessageBusVisitorSesssion

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;
     }
 
     /**