Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h =================================================================== --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h @@ -143,7 +143,7 @@ // Variant type data which can be assigned and retrieved across all command instances template bool SharedDataAdd(const CMIUtilString &vKey, const T &vData); template bool SharedDataRetrieve(const CMIUtilString &vKey, T &vwData); - bool SharedDataDestroy(); + void SharedDataDestroy(); // Common command required functionality bool AccessPath(const CMIUtilString &vPath, bool &vwbYesAccessible); Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp @@ -99,16 +99,9 @@ if (!m_bInitialized) return MIstatus::success; - bool bOk = MIstatus::success; - CMIUtilString errMsg; - // Tidy up - bOk = SharedDataDestroy(); - if (!bOk) - { - errMsg = MIRSRC(IDS_DBGSESSION_ERR_SHARED_DATA_RELEASE); - errMsg += "\n"; - } + SharedDataDestroy(); + m_vecActiveThreadId.clear(); CMICmnLLDBDebugSessionInfoVarObj::VarObjClear(); @@ -125,18 +118,15 @@ // stopped i.e. application shutdown. // Type: Method. // Args: None. -// Return: MIstatus::success - Functional succeeded. -// MIstatus::failure - Functional failed. +// Return: None. // Throws: None. //-- -bool +void CMICmnLLDBDebugSessionInfo::SharedDataDestroy() { m_mapIdToSessionData.Clear(); m_vecVarObj.clear(); m_mapBrkPtIdToBrkPtInfo.clear(); - - return MIstatus::success; } //++ ------------------------------------------------------------------------------------ Index: lldb/trunk/tools/lldb-mi/MICmnResources.h =================================================================== --- lldb/trunk/tools/lldb-mi/MICmnResources.h +++ lldb/trunk/tools/lldb-mi/MICmnResources.h @@ -152,7 +152,6 @@ IDS_LLDBOUTOFBAND_ERR_SETNEWDRIVERSTATE, IDS_LLDBOUTOFBAND_ERR_BRKPT_CNT_EXCEEDED, - IDS_DBGSESSION_ERR_SHARED_DATA_RELEASE, IDS_DBGSESSION_ERR_SHARED_DATA_ADD, IDS_MI_SHTDWN_ERR_LOG, Index: lldb/trunk/tools/lldb-mi/MICmnResources.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmnResources.cpp +++ lldb/trunk/tools/lldb-mi/MICmnResources.cpp @@ -141,8 +141,6 @@ "LLDB Out-of-band. %s. Event handler tried to set new MI Driver running state and failed. %s"}, {IDS_LLDBOUTOFBAND_ERR_BRKPT_CNT_EXCEEDED, "LLDB Out-of-band. '%s'. Number of valid breakpoint exceeded %d. Cannot create new breakpoint with ID %d"}, - {IDS_DBGSESSION_ERR_SHARED_DATA_RELEASE, - "LLDB debug session info. Release some or all of the data shared across command instances failed"}, {IDS_DBGSESSION_ERR_SHARED_DATA_ADD, "LLDB debug session info. Failed to add '%s' data to the shared data command container"}, {IDS_MI_SHTDWN_ERR_LOG, "Log. Error occurred during shutdown. %s"}, {IDS_MI_SHUTDOWN_ERR, "Server shutdown failure. %s"},