|
From: <za...@us...> - 2006-02-04 02:05:16
|
Update of /cvsroot/halfs/halfs/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13613/src Modified Files: hal_tree_monitor.cc Log Message: found unhandled exception... stiil need to investigate why it occured Index: hal_tree_monitor.cc =================================================================== RCS file: /cvsroot/halfs/halfs/src/hal_tree_monitor.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- hal_tree_monitor.cc 14 Jan 2006 00:36:08 -0000 1.1.1.1 +++ hal_tree_monitor.cc 4 Feb 2006 02:05:04 -0000 1.2 @@ -118,11 +118,18 @@ hal_tree_monitor::~hal_tree_monitor() { - // Stop monitor thread - if (m_monitor_thr.is_running()) + try { - m_monitor_thr.cancel(); - m_monitor_thr.join(); + // Stop monitor thread + if (m_monitor_thr.is_running()) + { + m_monitor_thr.cancel(); + m_monitor_thr.join(); + } + } + catch (...) + { + lout() << level::error << "Error on stop monitor thread\n"; } /// \todo Need to handle an errors libhal_ctx_shutdown(m_hal_ctx, &m_dbus_error); |