- Use a utility method that recomputes a timeout if VESPA_TIMER_HZ deviates from the default of 1000hz.

2 files changed, 2 insertions, 2 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index d7f488346ff..c47fe88dc71 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -88,7 +88,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
     }
 
     private void sendBlockedMessages() {
-        int timeout = 10*1000/SystemTimer.detectHz();
+        int timeout = SystemTimer.adjustTimeoutByDetectedHz(10);
         while (! destroyed.get()) {
             for (SendBlockedMessages sender : blockedSenders.keySet()) {
                 if (!sender.trySend()) {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
index 478cb7554ee..4f36cb3b328 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
@@ -149,7 +149,7 @@ public class Messenger implements Runnable {
 
     @Override
     public void run() {
-        int timeoutMS = 100*1000/SystemTimer.detectHz();
+        int timeoutMS = SystemTimer.adjustTimeoutByDetectedHz(100);
         while (true) {
             Task task = null;
             synchronized (this) {