TE: fix callback isDone() issue

1 files changed, 15 insertions, 13 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java
index c47311394..edeb6fd49 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java
@@ -157,18 +157,15 @@ public class Callback extends PropertiesContainer implements ICallback {
 			return;
 		}
 
-		status = checkStatusIntegrity(status);
+		setProperty(PROPERTY_IS_DONE, null);
+		setProperty(PROPERTY_STATUS, checkStatusIntegrity(status));
 
-		setProperty(PROPERTY_IS_DONE, true);
-		setProperty(PROPERTY_STATUS, status);
+		internalDone(caller, status);
 
-		ICallback parentCallback = (ICallback) getProperty(PROPERTY_PARENT_CALLBACK);
-		if (parentCallback != null && parentCallback.isDone()) {
-			CoreBundleActivator.getTraceHandler().trace("WARNING: parent callback called twice!!", 1, this); //$NON-NLS-1$
+		if (getProperty(PROPERTY_IS_DONE) == null) {
+			setProperty(PROPERTY_IS_DONE, true);
 		}
 
-		internalDone(caller, status);
-
 		if (isDone()) {
 			if (getProperty(PROPERTY_PROGRESS_MONITOR) instanceof IProgressMonitor) {
 				IProgressMonitor progress = ((IProgressMonitor) getProperty(PROPERTY_PROGRESS_MONITOR));
@@ -182,14 +179,19 @@ public class Callback extends PropertiesContainer implements ICallback {
 				}
 			}
 
-			parentCallback = (ICallback) getProperty(PROPERTY_PARENT_CALLBACK);
-			if (parentCallback != null && !parentCallback.isDone()) {
-				copyProperties(this, parentCallback);
-				if (!ProgressHelper.isCancelOrError(this,
+			ICallback parentCallback = (ICallback) getProperty(PROPERTY_PARENT_CALLBACK);
+			if (parentCallback != null) {
+				if (parentCallback.isDone()) {
+					CoreBundleActivator.getTraceHandler().trace("WARNING: parent callback called twice!!", 1, this); //$NON-NLS-1$
+				}
+				else {
+					copyProperties(this, parentCallback);
+					if (!ProgressHelper.isCancelOrError(this,
 													getStatus(),
 													(IProgressMonitor) getProperty(PROPERTY_PROGRESS_MONITOR),
 													parentCallback)) {
-					parentCallback.done(caller, getStatus());
+						parentCallback.done(caller, getStatus());
+					}
 				}
 			}
 		}