aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java4
-rw-r--r--container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java2
-rw-r--r--container-messagebus/src/main/java/com/yahoo/messagebus/shared/NullNetwork.java2
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java1
4 files changed, 5 insertions, 4 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index f43c1fcffd6..9fe3728dc2c 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -145,8 +145,8 @@ public final class ConfiguredApplication implements Application {
}
/**
- * The container has no RPC methods, but we still need an RPC sever
- * to register in Slobrok to enable orchestration
+ * The container has no RPC methods, but we still need an RPC server
+ * to register in Slobrok to enable orchestration.
*/
private Register registerInSlobrok(QrConfig qrConfig) {
if ( ! qrConfig.rpc().enabled()) return null;
diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
index cfb3223a4f0..850cfc0b4bf 100644
--- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
+++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
@@ -49,7 +49,7 @@ import java.util.logging.Logger;
// MbusClient, with or without throttling. This introduced the problem of ownership during shutdown,
// which was solved with manual reference counting. This is all much better solved with DI, which (now)
// owns everything, and does component shutdown in reverse construction order, which is always right.
-// So for the sake everyone's mental health, this should all just be removed now! I suspect this is
+// So for the sake of everyone's mental health, this should all just be removed now! I suspect this is
// even the case for Request; we can track in handlers, and warn when requests have been misplaced.
public final class SessionCache extends AbstractComponent {
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/NullNetwork.java b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/NullNetwork.java
index ad58d6b9a5e..bef3fdc1e34 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/NullNetwork.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/NullNetwork.java
@@ -12,7 +12,7 @@ import java.util.List;
/**
* <p>Used by SharedMessageBus as a network when the container runs in LocalApplication with no network services.</p>
*
- * @author <a href="mailto:vegardh@yahoo-inc.com">Vegard Havdal</a>
+ * @author Vegard Havdal
*/
class NullNetwork implements Network {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java
index 1cc45eeb2d8..f4d206ed7ad 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java
@@ -41,6 +41,7 @@ public abstract class RPCSend implements MethodHandler, ReplyHandler, RequestWai
protected abstract Reply createReply(Values ret, String serviceName, Trace trace);
protected abstract Params toParams(Values req);
protected abstract void createResponse(Values ret, Reply reply, Version version, byte [] payload);
+
@Override
public final void attach(RPCNetwork net) {
this.net = net;