diff options
| -rwxr-xr-x | documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java | 9 | ||||
| -rw-r--r-- | messagebus/src/main/java/com/yahoo/messagebus/Message.java | 2 |
2 files changed, 6 insertions, 5 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; } /** diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Message.java b/messagebus/src/main/java/com/yahoo/messagebus/Message.java index 6848ffc55d8..696211d7c45 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/Message.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Message.java @@ -101,7 +101,7 @@ public abstract class Message extends Routable { } /** - * <p>Sets the numer of milliseconds that remain before this message times out. Please see comment on {@link + * <p>Sets the number of milliseconds that remain before this message times out. Please see comment on {@link * #isExpired()} for more information on how to determine whether or not a message has expired.</p> * * @param timeRemaining The number of milliseconds until expiration. |