Kaydet (Commit) e658caed authored tarafından Michael Stahl's avatar Michael Stahl

Extension Manager: surely we should be able to spawn uno ...

... in finite time; waiting forever may hang the smoktetest in case uno
fails to start.

Change-Id: I42be4cecb8eec82df8f2df63f02e1223e4933626
üst 3782ae0b
......@@ -444,7 +444,7 @@ Reference<XInterface> resolveUnoURL(
Reference<bridge::XUnoUrlResolver> xUnoUrlResolver(
bridge::UnoUrlResolver::create( xLocalContext ) );
for (;;)
for (int i = 0; i <= 20; ++i) // 10 seconds
{
if (abortChannel != 0 && abortChannel->isAborted()) {
throw ucb::CommandAbortedException(
......@@ -454,10 +454,15 @@ Reference<XInterface> resolveUnoURL(
return xUnoUrlResolver->resolve( connectString );
}
catch (const connection::NoConnectException &) {
TimeValue tv = { 0 /* secs */, 500000000 /* nanosecs */ };
::osl::Thread::wait( tv );
if (i < 20)
{
TimeValue tv = { 0 /* secs */, 500000000 /* nanosecs */ };
::osl::Thread::wait( tv );
}
else throw;
}
}
return 0; // warning C4715
}
#ifdef WNT
......
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