From bbe00c902eaa69101699c40bb90e9a5c2bff016a Mon Sep 17 00:00:00 2001
From: William Riley <william.riley@renesas.com>
Date: Tue, 15 May 2018 14:20:34 +0100
Subject: [PATCH] Bug 514838 - Return sessionId when context is
 IExecutionDMContext

Return the session id from setDebugContext when dmContext is
IExecutionDMContext. This session id is needed in
DisassemblyPart.updateDebugContext()

Change-Id: I28f51d990f2b9c51718e5859279ea252091e3beb
---
 .../debug/internal/ui/disassembly/DisassemblyBackendDsf.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
index cf71de4363c..6b5dd4ff4e7 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
@@ -269,7 +269,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 			}
 		} else if (dmContext instanceof IExecutionDMContext) {
 			// When switching to and between thread and application nodes.
-			result.sessionId = null;
+			result.sessionId = fDsfSessionId;
 			result.contextChanged = false;
 			fTargetContext = (IExecutionDMContext) dmContext;
 			fTargetFrameContext = null;