| commit | b4b1a657e88e1559809d765c5a3d9d24c683bdb3 | [log] [tgz] |
|---|---|---|
| author | Andrey Loskutov <loskutov@gmx.de> | Mon Oct 23 16:28:01 2017 +0200 |
| committer | Andrey Loskutov <loskutov@gmx.de> | Mon Oct 23 16:28:01 2017 +0200 |
| tree | aee16a092d65c932ff40f1060ab87646f1b2d4c7 | |
| parent | abc63aa2a32d22a270d08cb909e12ae295e2ee5f [diff] |
Bug 526368 - NPE in ProgressInfoItem.getJobNameAndStatus Change-Id: Ia0522c0e666142f8ee3552094919e64be432b3b2 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java index 9bf57fe..a93782c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java
@@ -430,8 +430,8 @@ return NLS.bind(ProgressMessages.JobInfo_Cancelled, name); } - if (jobInfo.isBlocked()) { - IStatus blockedStatus = jobInfo.getBlockedStatus(); + IStatus blockedStatus = jobInfo.getBlockedStatus(); + if (blockedStatus != null) { return NLS.bind(ProgressMessages.JobInfo_Blocked, name, blockedStatus.getMessage()); }