Fix assorted ErrorProne warnings.

RELNOTES: None.
PiperOrigin-RevId: 167574104

2 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java b/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
index 24e0947258..4a6f4f7acc 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
@@ -35,7 +35,7 @@ public final class CommandResult {
     new ByteArrayOutputStream() {
 
       @Override
-      public byte[] toByteArray() {
+      public synchronized byte[] toByteArray() {
         return NO_BYTES;
       }
   };
@@ -44,7 +44,7 @@ public final class CommandResult {
     new ByteArrayOutputStream(){
 
       @Override
-      public byte[] toByteArray() {
+      public synchronized byte[] toByteArray() {
         throw new IllegalStateException("Output was not collected");
       }
   };
diff --git a/src/main/java/com/google/devtools/build/lib/shell/LogUtil.java b/src/main/java/com/google/devtools/build/lib/shell/LogUtil.java
index c2e055e4f0..44cac2c0f5 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/LogUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/LogUtil.java
@@ -13,6 +13,8 @@
 // limitations under the License.
 package com.google.devtools.build.lib.shell;
 
+import java.nio.charset.StandardCharsets;
+
 /**
  * Utilities for logging.
  */
@@ -38,7 +40,7 @@ class LogUtil {
      */
     try {
       if (bytes.length > TRUNCATE_STRINGS_AT) {
-        return new String(bytes, 0, TRUNCATE_STRINGS_AT)
+        return new String(bytes, 0, TRUNCATE_STRINGS_AT, StandardCharsets.UTF_8)
           + "[... truncated. original size was " + bytes.length + " bytes.]";
       }
       return new String(bytes);