IOException + merkleTree nullcheck + ignoring remoteDiscardMerkleTrees

src/main/java/com/google/devtools/build/lib/remote/RemoteAction.java

@@ -29,6 +29,7 @@
 import java.util.SortedMap;
 import javax.annotation.Nullable;
 import java.io.FileWriter;
+import java.io.IOException;
 
 /**
  * A value class representing an action which can be executed remotely.
@@ -43,6 +44,7 @@ public class RemoteAction {
   private final RemoteActionExecutionContext remoteActionExecutionContext;
   private final RemotePathResolver remotePathResolver;
   @Nullable private final MerkleTree merkleTree;
+  @Nullable private final MerkleTree merkleTreeForDebug;
   private final long inputBytes;
   private final long inputFiles;
   private final Digest commandHash;
@@ -66,6 +68,7 @@ public class RemoteAction {
     this.remoteActionExecutionContext = remoteActionExecutionContext;
     this.remotePathResolver = remotePathResolver;
     this.merkleTree = remoteDiscardMerkleTrees ? null : merkleTree;
+    this.merkleTreeForDebug = merkleTree;
     this.inputBytes = merkleTree.getInputBytes();
     this.inputFiles = merkleTree.getInputFiles();
     this.commandHash = commandHash;
@@ -76,10 +79,14 @@ public class RemoteAction {
 
   private void writeDirectoryToFile(FileWriter writer, String root, MerkleTree t) throws IOException {
     writer.write("[Root proto of " + root + "]\n");
-    writer.write(t.rootProto.toString());
-    for (String dirName : t.directories.keySet()) {
-      MerkleTree dir = t.directories.get(dirName);
-      writeDirectoryToFile(writer, root + "/" + dirName, dir);
+    if (t != null) {
+      writer.write(t.rootProto.toString());
+      for (String dirName : t.directories.keySet()) {
+        MerkleTree dir = t.directories.get(dirName);
+        writeDirectoryToFile(writer, root + "/" + dirName, dir);
+      }
+    } else {
+      writer.write("[merkleTree is null]\n");
     }
   }
 
@@ -95,7 +102,7 @@ public void writeToFile() {
         writer.write("\n\n");
 
         writer.write("[InputRoot]\n");
-        writeDirectoryToFile(writer, ".", merkleTree);
+        writeDirectoryToFile(writer, ".", merkleTreeForDebug);
 
         System.out.println(jsonPath + " written.");
     } catch (IOException e) {