Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-07-14 13:54:13 +0000
committerUwe Stieber2014-07-14 13:54:13 +0000
commitd1ce821329717ba577cbd844bcd5108ed77738ab (patch)
treeb7ecb848968f60fa67feb2b7adf139df482d6046 /target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper
parent7c42bffdefd8f124f123aa5fec5ccd8d94544473 (diff)
downloadorg.eclipse.tcf-d1ce821329717ba577cbd844bcd5108ed77738ab.tar.gz
org.eclipse.tcf-d1ce821329717ba577cbd844bcd5108ed77738ab.tar.xz
org.eclipse.tcf-d1ce821329717ba577cbd844bcd5108ed77738ab.zip
Target Explorer: Fix stepper based channel manager error handling
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/job/StepperJob.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/utils/StepperHelper.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/job/StepperJob.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/job/StepperJob.java
index e6c3d16c9..d9dad274c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/job/StepperJob.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/job/StepperJob.java
@@ -291,6 +291,10 @@ public final class StepperJob extends Job {
handler[0].handleStatus(status, null, null);
}
}
+ markStatusHandled();
+ }
+
+ public void markStatusHandled() {
statusHandled = true;
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/utils/StepperHelper.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/utils/StepperHelper.java
index ab7dd8c2e..03582c986 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/utils/StepperHelper.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/utils/StepperHelper.java
@@ -39,12 +39,10 @@ public final class StepperHelper {
return stepperOperationService;
}
- public static final StepperJob scheduleStepperJob(Object context, String operation, IStepperOperationService service, IPropertiesContainer data, ICallback callback, IProgressMonitor monitor) {
+ public static final void scheduleStepperJob(Object context, String operation, IStepperOperationService service, IPropertiesContainer data, ICallback callback, IProgressMonitor monitor) {
Assert.isNotNull(service);
Assert.isNotNull(data);
- StepperJob job = null;
-
IStepContext stepContext = service.getStepContext(context, operation);
String stepGroupId = service.getStepGroupId(context, operation);
String name = service.getStepGroupName(context, operation);
@@ -59,7 +57,7 @@ public final class StepperHelper {
}
if (stepGroupId != null && stepContext != null) {
- job = new StepperJob(name != null ? name : "", stepContext, data, stepGroupId, operation, isCancelable, monitor == null); //$NON-NLS-1$
+ StepperJob job = new StepperJob(name != null ? name : "", stepContext, data, stepGroupId, operation, isCancelable, monitor == null); //$NON-NLS-1$
job.setJobCallback(callback);
if (monitor != null) {
@@ -69,7 +67,5 @@ public final class StepperHelper {
job.schedule();
}
}
-
- return job;
}
}

Back to the top