From b16c33fe068781a6b1d48c0e0c25c64e97b9aa7b Mon Sep 17 00:00:00 2001 From: Yunchan Cho Date: Sat, 2 Feb 2013 16:57:41 +0900 Subject: [PATCH] Change DPL::WaitableHandleWatchSupport's destructor not to call DPL:Aassert explicitly. [Issue#] N_SE-23934 [Problem] When chatter, SDK sample webapp, is closed, chatter's Web Process is asserted [Cause] DPL::WaitableHandleWatchSupport's destructor call assert if its map container has any instance. [Solution] DPL::WaitableHandleWatchSupport's destructor doesn't call assert function explicitly in any case. Even if its map container has any instance, destructor of map container releases existing instances in it automatically. Change-Id: Ieb54e1b6a692132222e72e7b41f0666d4a211afa --- modules/core/src/waitable_handle_watch_support.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/core/src/waitable_handle_watch_support.cpp b/modules/core/src/waitable_handle_watch_support.cpp index e3d544c..66fc8b5 100644 --- a/modules/core/src/waitable_handle_watch_support.cpp +++ b/modules/core/src/waitable_handle_watch_support.cpp @@ -38,27 +38,25 @@ WaitableHandleWatchSupport::~WaitableHandleWatchSupport() // Developer assertions if (!m_watchersMap.empty()) { - LogPedantic("### Leaked watchers map dump ###"); + LogWarning("### Leaked watchers map dump ###"); for (WaitableHandleWatchersMap::const_iterator iterator = m_watchersMap.begin(); iterator != m_watchersMap.end(); ++iterator) { - LogPedantic("### Waitable handle: " << iterator->first); + LogWarning("### Waitable handle: " << iterator->first); - LogPedantic("### Read listeners: " << iterator->second.readListenersCount); - LogPedantic("### Write listeners: " << iterator->second.writeListenersCount); + LogWarning("### Read listeners: " << iterator->second.readListenersCount); + LogWarning("### Write listeners: " << iterator->second.writeListenersCount); for (WaitableHandleListenerList::const_iterator listenersIterator = iterator->second.listeners.begin(); listenersIterator != iterator->second.listeners.end(); ++listenersIterator) { - LogPedantic("### Mode: " << listenersIterator->mode << ". Listener: 0x" << std::hex << listenersIterator->listener); + LogWarning("### Mode: " << listenersIterator->mode << ". Listener: 0x" << std::hex << listenersIterator->listener); } } } - - Assert(m_watchersMap.empty() == true); } WaitableHandle WaitableHandleWatchSupport::WaitableInvokerHandle() const -- 2.7.4