Kaydet (Commit) 8da3121a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
üst 3c9c9c54
...@@ -445,7 +445,7 @@ Reference<XInterface> resolveUnoURL( ...@@ -445,7 +445,7 @@ Reference<XInterface> resolveUnoURL(
Reference<bridge::XUnoUrlResolver> xUnoUrlResolver( Reference<bridge::XUnoUrlResolver> xUnoUrlResolver(
bridge::UnoUrlResolver::create( xLocalContext ) ); 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()) { if (abortChannel != nullptr && abortChannel->isAborted()) {
throw ucb::CommandAbortedException( "abort!" ); throw ucb::CommandAbortedException( "abort!" );
...@@ -454,7 +454,7 @@ Reference<XInterface> resolveUnoURL( ...@@ -454,7 +454,7 @@ Reference<XInterface> resolveUnoURL(
return xUnoUrlResolver->resolve( connectString ); return xUnoUrlResolver->resolve( connectString );
} }
catch (const connection::NoConnectException &) { catch (const connection::NoConnectException &) {
if (i < 20) if (i < 40)
{ {
::osl::Thread::wait( std::chrono::milliseconds(500) ); ::osl::Thread::wait( std::chrono::milliseconds(500) );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment