commit 5e71e7bb71ff761cc7aa0ebfda32dfa189c07e53
author Julien Desprez <jdesprez@google.com> Thu Apr 16 18:20:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 16 18:20:55 2020 +0000
tree 000ccee9533f23bafcb2e88a1f92887ad799e82e
parent 6291a0e17b452a2c3cc4ba9a8a5e2be690243ec0
parent d32aa29ab559aa2638b6871c04c9ce7b4a837af6

Merge "Avoid NPE if we fail to fetch stderr"

src/com/android/tradefed/invoker/RemoteInvocationExecution.java

diff --git a/src/com/android/tradefed/invoker/RemoteInvocationExecution.java b/src/com/android/tradefed/invoker/RemoteInvocationExecution.java
index d7843d9..a87a79e 100644
--- a/src/com/android/tradefed/invoker/RemoteInvocationExecution.java
+++ b/src/com/android/tradefed/invoker/RemoteInvocationExecution.java
@@ -359,8 +359,12 @@
                             info,
                             options,
                             runUtil);
-            mRemoteConsoleStdErr = FileUtil.readStringFromFile(stderr);
-            FileUtil.recursiveDelete(stderr);
+            if (stderr != null && stderr.exists()) {
+                mRemoteConsoleStdErr = FileUtil.readStringFromFile(stderr);
+                FileUtil.recursiveDelete(stderr);
+            } else {
+                mRemoteConsoleStdErr = "Failed to fetch stderr from remote.";
+            }
         }
 
         // If not result in progress are reported, parse the full results at the end.