[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - extensions/source
Michael Meeks
michael.meeks at suse.com
Thu Jun 13 06:45:58 PDT 2013
extensions/source/update/check/updatecheckjob.cxx | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 32dd90d49dfcf82a04642676d8b6e60a3dca7eef
Author: Michael Meeks <michael.meeks at suse.com>
Date: Wed Jun 5 13:03:22 2013 +0100
fdo#64962 - ignore exceptions from checking with the update service.
Change-Id: If627b303f8710b915dcbdcb899454631f607e217
Reviewed-on: https://gerrit.libreoffice.org/4164
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 2360daf..3593a38 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -133,11 +133,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() {
More information about the Libreoffice-commits
mailing list