TCF Debugger: diagnostics test fixed: the test can get into infinite loop if for some commands agent respond with no error and no data

1 files changed, 6 insertions, 0 deletions

diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java
index e638b7106..c5ad02ab5 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java
@@ -189,6 +189,9 @@ class TestExpressions implements ITCFTest,
                     if (error != null) {
                         exit(error);
                     }
+                    else if (id == null) {
+                        exit(new Exception("Test context ID must not be null"));
+                    }
                     else {
                         test_ctx_id = id;
                         runTest();
@@ -280,6 +283,9 @@ class TestExpressions implements ITCFTest,
                     if (error != null) {
                         exit(error);
                     }
+                    else if (symbol == null) {
+                        exit(new Exception("Symbol must not be null: tcf_test_func3"));
+                    }
                     else {
                         sym_func3 = symbol;
                         runTest();