Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4164

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/4164/1

fdo#64962 - ignore exceptions from checking with the update service.

Change-Id: If627b303f8710b915dcbdcb899454631f607e217
---
M extensions/source/update/check/updatecheckjob.cxx
1 file changed, 10 insertions(+), 4 deletions(-)



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 @@
             return;
     }
 
-    rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
-    aController->initialize( m_xParameters, m_xContext );
+    try {
+        rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
+        aController->initialize( m_xParameters, m_xContext );
 
-    if ( m_bShowDialog )
-        aController->showDialog( true );
+        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() {

-- 
To view, visit https://gerrit.libreoffice.org/4164
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If627b303f8710b915dcbdcb899454631f607e217
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Meeks <michael.meeks@suse.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.