Some cleanup changes.

--
MOS_MIGRATED_REVID=87821306

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/server/ServerResponse.java b/src/main/java/com/google/devtools/build/lib/server/ServerResponse.java
index e5ab9300f7..f222564fc2 100644
--- a/src/main/java/com/google/devtools/build/lib/server/ServerResponse.java
+++ b/src/main/java/com/google/devtools/build/lib/server/ServerResponse.java
@@ -95,12 +95,14 @@ final class ServerResponse {
     if (errorMessage.length() == 0) {
       return Integer.toString(exitStatus) + '\n';
     }
-    return errorMessage + '\n' + Integer.toString(exitStatus) + '\n';
+    return errorMessage + '\n' + exitStatus + '\n';
   }
 
   @Override
   public boolean equals(Object other) {
-    if (other == null || !(other instanceof ServerResponse)) return false;
+    if (!(other instanceof ServerResponse)) {
+      return false;
+    }
     ServerResponse otherResponse = (ServerResponse) other;
     return exitStatus == otherResponse.exitStatus
         && errorMessage.equals(otherResponse.errorMessage);