Kaydet (Commit) 69aff995 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Do not fail isStillAlive for "connect:" connections

üst f07a22ff
......@@ -180,7 +180,12 @@ OfficeConnection::getComponentContext() const {
}
bool OfficeConnection::isStillAlive() const {
OSL_ASSERT(process_ != 0);
if (process_ == 0) {
// In case "soffice" argument starts with "connect:" we have no direct
// control over the liveness of the soffice.bin process (would need to
// directly monitor the bridge) so can only assume the best here:
return true;
}
TimeValue delay = { 0, 0 }; // 0 sec
oslProcessError e = osl_joinProcessWithTimeout(process_, &delay);
CPPUNIT_ASSERT(e == osl_Process_E_None || e == osl_Process_E_TimedOut);
......
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