diff options
| author | Stefan Xenos | 2016-11-22 18:25:26 +0000 |
|---|---|---|
| committer | Stefan Xenos | 2016-11-22 18:26:00 +0000 |
| commit | 1a0a0068fc8c3997f73bea9d60f7365855291435 (patch) | |
| tree | 01f35da6263a3bd126dfc625c43791782c8ff786 | |
| parent | f3511f0a38be465923c1d735072f234597af1bff (diff) | |
| download | rt.equinox.bundles-1a0a0068fc8c3997f73bea9d60f7365855291435.tar.gz rt.equinox.bundles-1a0a0068fc8c3997f73bea9d60f7365855291435.tar.xz rt.equinox.bundles-1a0a0068fc8c3997f73bea9d60f7365855291435.zip | |
Bug 507982 - split(SUPPRESS_ISCANCELED) should not check cancellationY20161124-1000I20161128-2000I20161128-0600I20161128-0330I20161127-2000I20161127-1300I20161126-2000I20161126-0815I20161125-2000I20161124-2000I20161123-2000
Change-Id: Ic6bdcf6347e86b500d07a7336b3d52c7e2a7ef2a
Signed-off-by: Stefan Xenos <sxenos@gmail.com>
| -rw-r--r-- | bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java index b2a31afe5..ddbb3170e 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java @@ -972,7 +972,7 @@ public final class SubMonitor implements IProgressMonitorWithBlocking { int oldUsedForParent = this.usedForParent; SubMonitor result = newChild(totalWork, suppressFlags); - if ((flags & SUPPRESS_ISCANCELED) == 0) { + if ((result.flags & SUPPRESS_ISCANCELED) == 0) { int ticksTheChildWillReportToParent = result.totalParent; // If the new child reports a nonzero amount of progress. |