Bug 232410: [tcf][api] TCF needs standard way to define agent error codes

2 files changed, 13 insertions, 2 deletions

diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java
index 7e7c36211..ea790e6a3 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFSelfTest.java
@@ -407,6 +407,12 @@ class TCFSelfTest {
             assert context != null;
             IRunControl.RunControlContext ctx = map.get(context);  
             if (ctx == null) exit(new Error("Invalid 'contextSuspended' event for " + context));
+            if (process_ids.contains(ctx.getParentID())) {
+                ctx.resume(IRunControl.RM_RESUME, 1, new IRunControl.DoneCommand() {
+                    public void doneCommand(IToken token, Exception error) {
+                    }
+                });
+            }
         }
     }
     
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFAnnotationManager.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFAnnotationManager.java
index 4ec3fbded..d44e61ef6 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFAnnotationManager.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFAnnotationManager.java
@@ -181,8 +181,13 @@ public class TCFAnnotationManager {
         TCFLaunch.addListener(launch_listener);
         displayExec(new Runnable() {
             public void run() {
-                for (IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()) {
-                    window_listener.windowOpened(window);
+                try {
+                    for (IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()) {
+                        window_listener.windowOpened(window);
+                    }
+                }
+                catch (NullPointerException x) {
+                    // TODO: bug in Eclipse: NullPointerException is thrown by getWorkbenchWindows()
                 }
                 PlatformUI.getWorkbench().addWindowListener(window_listener);
                 IWorkbenchWindow w = PlatformUI.getWorkbench().getActiveWorkbenchWindow();