gdbtrace.core: handle selection with heterogenous traces

Check that a child trace is a GdbTrace before casting. Change comparison from object.equals(other) to Objects.equals(a,b) This avoids exceptions. This should not change the functioning, but reduce the false positive errors (NPE) in the console. The exception before was aborting the if statement on false. Change-Id: I1636e9cb856e5fbf69a33d9e6a8e6cbaa539219e Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/201860 Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org> Tested-by: Patrick Tasse <patrick.tasse@gmail.com> Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
eclipse-tracecompass · Jun 8, 2023 · 05f9784 · 05f9784
1 parent 1e09a7c
commit 05f9784
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/...dbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/DsfGdbAdaptor.java b/...dbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/DsfGdbAdaptor.java
@@ -21,6 +21,7 @@
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -213,7 +214,7 @@ public void debugContextChanged(DebugContextEvent event) {
                             String sessionId;
                             synchronized (SESSION_LOCK) {
                                 sessionId = context.getSessionId();
-                                if (sessionId.equals(fCurrentSessionId)) {
+                                if (Objects.equals(sessionId,fCurrentSessionId)) {
                                     return;
                                 }
                                 fCurrentSessionId = sessionId;
@@ -837,7 +838,7 @@ private static void closeGdbTraceEditor(final String sessionId) {
                         if (editor instanceof ITmfTraceEditor) {
                             ITmfTrace trace = ((ITmfTraceEditor) editor).getTrace();
                             if (trace instanceof GdbTrace) {
-                                if (((GdbTrace) trace).getDsfSessionId().equals(sessionId)) {
+                                if (Objects.equals(((GdbTrace) trace).getDsfSessionId(), sessionId)) {
                                     wbPage.closeEditor(editor, false);
                                 }
                             }
@@ -857,7 +858,7 @@ private static void selectGdbTraceEditor(final String sessionId, final int recor
                         if (editor instanceof ITmfTraceEditor) {
                             ITmfTrace trace = ((ITmfTraceEditor) editor).getTrace();
                             if (trace instanceof GdbTrace) {
-                                if (((GdbTrace) trace).getDsfSessionId().equals(sessionId)) {
+                                if (Objects.equals(((GdbTrace) trace).getDsfSessionId(), sessionId)) {
                                     wbPage.bringToTop(editor);
                                     if (recordId != -1) {
                                         gotoRank(editor, recordId);
@@ -869,14 +870,16 @@ private static void selectGdbTraceEditor(final String sessionId, final int recor
                                 List<ITmfTrace> expTraces = experiment.getTraces();
                                 int nbTraces = expTraces.size();
                                 for (int i = 0; i < nbTraces; i++) {
-                                    GdbTrace gdbTrace = (GdbTrace) expTraces.get(i);
-                                    if (gdbTrace.getDsfSessionId().equals(sessionId)) {
-                                        wbPage.bringToTop(editor);
-                                        if (recordId != -1) {
-                                            int rank = recordId * nbTraces + i;
-                                            gotoRank(editor, rank);
+                                    if (trace instanceof GdbTrace) {
+                                        GdbTrace gdbTrace = (GdbTrace) expTraces.get(i);
+                                        if (Objects.equals(gdbTrace.getDsfSessionId(), sessionId)) {
+                                            wbPage.bringToTop(editor);
+                                            if (recordId != -1) {
+                                                int rank = recordId * nbTraces + i;
+                                                gotoRank(editor, rank);
+                                            }
+                                            return;
                                         }
-                                        return;
                                     }
                                 }
                             }