aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index 724b1a7d7d..839e0731fc 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -313,7 +313,10 @@ public class SpawnAction extends AbstractAction {
@Override
protected String getRawProgressMessage() {
- return progressMessage;
+ if (progressMessage != null) {
+ return progressMessage;
+ }
+ return super.getRawProgressMessage();
}
@Override