commit 77303b435c443c48cd81cc0b0d4315ca8868fd22
author Florian Weikert <fwe@google.com> Thu Aug 27 08:24:24 2015 +0000
committer Philipp Wollermann <philwo@google.com> Thu Aug 27 14:45:15 2015 +0000
tree 9057c062ce78cad948ef2ec07966624024fb2ab7
parent 47107aad33695a040b0f771f0c09d66874c4d533

Ensures that EvalExceptionWithStackTrace does not have an empty exception message.

--
MOS_MIGRATED_REVID=101659996

src/main/java/com/google/devtools/build/lib/syntax/EvalException.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalException.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalException.java
index 32f289b..0382079 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalException.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalException.java
@@ -70,8 +70,11 @@
     if (message == null) {
       message = "";
     }
-    if (cause != null && !message.contains(cause.getMessage())) {
-      message = message + (message.isEmpty() ? "" : ": ") + cause.getMessage();
+    if (cause != null) {
+      String causeMsg = cause.getMessage();
+      if (causeMsg != null && !message.contains(causeMsg)) {
+        message = message + (message.isEmpty() ? "" : ": ") + causeMsg;
+      }
     }
     if (message.isEmpty()) {
       LoggingUtil.logToRemote(Level.SEVERE, "Invalid EvalException", cause);