diff options
| author |  Daniel Wagner-Hall <danielwh@google.com> | 2015-05-18 22:19:16 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2015-05-19 09:32:13 +0000 |
| commit | d3461dba46b50719e238939946048cd1ca12755a (patch) | |
| tree | c25a6a44c2ba2ff27fd2a1a615a14ab3386990b3 /src/main/java/com | |
| parent | dd51966ba6bcecb786cb86d3532ab6cf1775ec63 (diff) | |
RELNOTES: Use a default implementation of a progress message, rather than defaulting to null for all SpawnActions.
Right now, all Objc actions, and many others, have no progress message because
the sensible default in AbstractAction is overridden to return null.
--
MOS_MIGRATED_REVID=93930803
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java | 5 |
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 |