diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-06-05 13:03:22 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-05 13:10:29 +0100 |
commit | 9d1360a371f7335f1ede2f9ffe6f0282c53a07e7 (patch) | |
tree | 4e331c927e5556c2ea50cdabe3c5102c246064e7 | |
parent | 8cbb5ceaa788f2c3ca4326d85edba02d2d8cf06e (diff) |
fdo#64962 - ignore exceptions from checking with the update service.
Change-Id: If627b303f8710b915dcbdcb899454631f607e217
-rw-r--r-- | extensions/source/update/check/updatecheckjob.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index d61700e5f073..b9cf884d8850 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -131,11 +131,17 @@ void SAL_CALL InitUpdateCheckJobThread::run() return; } - rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); - aController->initialize( m_xParameters, m_xContext ); - - if ( m_bShowDialog ) - aController->showDialog( true ); + try { + rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); + aController->initialize( m_xParameters, m_xContext ); + + if ( m_bShowDialog ) + aController->showDialog( true ); + } catch (const uno::Exception &e) { + // fdo#64962 - don't bring the app down on some unexpected exception. + OSL_TRACE( "Caught init update exception: %s\n thread terminated.\n", + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + } } void InitUpdateCheckJobThread::setTerminating() { |