Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java
index 293c3e0db..63fda4d9d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java
@@ -91,6 +91,7 @@ public class StepExecutor implements IStepExecutor {
int ticksToUse = step.getTotalWork(context, data);
progress = ProgressHelper.getProgressMonitor(progress, ticksToUse);
+ Assert.isNotNull(progress);
ProgressHelper.beginTask(progress, step.getLabel(), ticksToUse);
// Create the handler (and the callback) for the current step
@@ -127,7 +128,7 @@ public class StepExecutor implements IStepExecutor {
return;
}
- if (callback.getStatus().matches(IStatus.CANCEL) || (progress != null && progress.isCanceled())) {
+ if (callback.getStatus().matches(IStatus.CANCEL) || progress.isCanceled()) {
throw new OperationCanceledException(callback.getStatus().getMessage());
}

Back to the top