[Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

 desktop/source/deployment/misc/dp_misc.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8da3121ac36e7bdc3297bf9aa4786d672a869c9d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 13 14:48:25 2018 +0100

    Increase resolveUnoURL timeout from 20 to 40 sec
    
    (Used when a unopkg process talks to an soffice process, or a unopkg or soffice
    process talks to a uno process.)  Jenkins lo_ubsan ASan+UBSan builds quite often
    fail in CustomTarget_odk/build-examples with connections from an unopkg process
    to a uno process (that has just been forked by the unopkg process) timing out.
    Lets see if increasing the timeout will fix that.
    
    Change-Id: Ifcd886f00670f86bb8975a206c89f565d409912e

diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 39ca5ad87164..9ab6d8f09743 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -445,7 +445,7 @@ Reference<XInterface> resolveUnoURL(
     Reference<bridge::XUnoUrlResolver> xUnoUrlResolver(
         bridge::UnoUrlResolver::create( xLocalContext ) );
 
-    for (int i = 0; i <= 20; ++i) // 10 seconds
+    for (int i = 0; i <= 40; ++i) // 20 seconds
     {
         if (abortChannel != nullptr && abortChannel->isAborted()) {
             throw ucb::CommandAbortedException( "abort!" );
@@ -454,7 +454,7 @@ Reference<XInterface> resolveUnoURL(
             return xUnoUrlResolver->resolve( connectString );
         }
         catch (const connection::NoConnectException &) {
-            if (i < 20)
+            if (i < 40)
             {
                 ::osl::Thread::wait( std::chrono::milliseconds(500) );
             }