More non-functional changse, typos

3 files changed, 12 insertions, 21 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index 99d9a6d6483..925968b9ade 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -608,5 +608,5 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
         }
 
     }
-}
 
+}
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
index 0cc8310937b..871a8f2a0b4 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
@@ -128,7 +128,7 @@ public class Messenger implements Runnable {
      */
     public boolean destroy() {
         boolean done = false;
-        enqueue(Terminate.INSTANCE);
+        enqueue(TERMINATE);
         if (!destroyed.getAndSet(true)) {
             try {
                 synchronized (this) {
@@ -161,7 +161,7 @@ public class Messenger implements Runnable {
                     task = queue.poll();
                 }
             }
-            if (task == Terminate.INSTANCE) {
+            if (task == TERMINATE) {
                 break;
             }
             if (task != null) {
@@ -175,7 +175,7 @@ public class Messenger implements Runnable {
                 } catch (final Exception e) {
                     log.warning("An exception was thrown while destroying " + task.getClass().getName() + ": " +
                                 e.toString());
-                    log.warning("Someone, somewhere might have to wait indefinetly for something.");
+                    log.warning("Someone, somewhere might have to wait indefinitely for something.");
                 }
             }
             for (final Task child : children) {
@@ -235,18 +235,9 @@ public class Messenger implements Runnable {
         }
     }
 
-    private static class Terminate implements Task {
+    private static final Task TERMINATE = new Task() {
+        @Override public void run() { }
+        @Override public void destroy() { }
+    };
 
-        static final Terminate INSTANCE = new Terminate();
-
-        @Override
-        public void run() {
-            // empty
-        }
-
-        @Override
-        public void destroy() {
-            // empty
-        }
-    }
 }
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 f4d206ed7ad..c09177a3613 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
@@ -122,16 +122,16 @@ public abstract class RPCSend implements MethodHandler, ReplyHandler, RequestWai
             switch (req.errorCode()) {
                 case com.yahoo.jrt.ErrorCode.TIMEOUT:
                     error = new Error(ErrorCode.TIMEOUT,
-                            "A timeout occured while waiting for '" + serviceName + "' (" +
+                            "A timeout occurred while waiting for '" + serviceName + "' (" +
                                     ctx.timeout + " seconds expired); " + req.errorMessage());
                     break;
                 case com.yahoo.jrt.ErrorCode.CONNECTION:
                     error = new Error(ErrorCode.CONNECTION_ERROR,
-                            "A connection error occured for '" + serviceName + "'; " + req.errorMessage());
+                            "A connection error occurred for '" + serviceName + "'; " + req.errorMessage());
                     break;
                 default:
                     error = new Error(ErrorCode.NETWORK_ERROR,
-                            "A network error occured for '" + serviceName + "'; " + req.errorMessage());
+                            "A network error occurred for '" + serviceName + "'; " + req.errorMessage());
             }
         } else {
             reply = createReply(req.returnValues(), serviceName, ctx.trace);
@@ -229,7 +229,7 @@ public abstract class RPCSend implements MethodHandler, ReplyHandler, RequestWai
             }
             if (payload == null || payload.length == 0) {
                 reply.addError(new Error(ErrorCode.ENCODE_ERROR,
-                        "An error occured while encoding the reply."));
+                        "An error occurred while encoding the reply."));
             }
         }
         createResponse(ctx.request.returnValues(), reply, ctx.version, payload);