summaryrefslogtreecommitdiffstats
path: root/messagebus
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-12-15 20:03:29 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-12-15 20:03:29 +0100
commit4caad05e6349bec8980e0a27b225cd0fc419cc6e (patch)
tree067642bed5d8add4af1325e476155e63f9dfd430 /messagebus
parent42cf29fb7452f9d50b6dcbf2cde1102f1543eb6f (diff)
Turn on reindexing by default
Diffstat (limited to 'messagebus')
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java4
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
index 309316b450a..ca772ce6c3a 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
@@ -4,7 +4,7 @@ package com.yahoo.messagebus;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * A session which supports receiving, forwarding and acknowledgement of messages. An intermediate session is expacted
+ * A session which supports receiving, forwarding and acknowledging messages. An intermediate session is expected
* to either forward or acknowledge every message received.
*
* @author Simon Thoresen Hult
@@ -49,7 +49,7 @@ public final class IntermediateSession implements MessageHandler, ReplyHandler {
/**
* This method unregisters this session from message bus, effectively disabling any more messages from being
* delivered to the message handler. After unregistering, this method calls {@link com.yahoo.messagebus.MessageBus#sync()}
- * as to ensure that there are no threads currently entangled in the handler.
+ * to ensure that there are no threads currently entangled in the handler.
*
* This method will deadlock if you call it from the message or reply handler.
*/
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
index 0b731a4c6fb..204bf2f7906 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
@@ -186,7 +186,7 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked
if (msg.isExpired()) {
Error error = new Error(ErrorCode.TIMEOUT, "Timed out in sendQ");
notifyComplete(new Result(error));
- replyHandler.handleReply(createSendTimedoutReply(msg, error));
+ replyHandler.handleReply(createSendTimedOutReply(msg, error));
return true;
}
return false;
@@ -214,7 +214,7 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked
}
}
- private Reply createSendTimedoutReply(Message msg, Error error) {
+ private Reply createSendTimedOutReply(Message msg, Error error) {
Reply reply = new EmptyReply();
reply.setMessage(msg);
reply.addError(error);