Make exception in case a test tries to remote-log more informative.

--
MOS_MIGRATED_REVID=103290841

1 files changed, 8 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 307544f11e..a727decee6 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -1384,14 +1384,18 @@ public final class BlazeRuntime {
         new Handler() {
           @Override
           public void publish(LogRecord record) {
-            throw new IllegalStateException(
+            Throwable e = record.getThrown();
+            String message =
                 record.getSourceClassName()
                     + "#"
                     + record.getSourceMethodName()
                     + ": "
-                    + record.getMessage()
-                    + "\n"
-                    + record.getThrown());
+                    + record.getMessage();
+            if (e == null) {
+              throw new IllegalStateException(message);
+            } else {
+              throw new IllegalStateException(message, e);
+            }
           }
 
           @Override