Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 895995 Details for
Bug 1097646
[fix available] libreoffice crashes with multiple UNO connections
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Don't unduly delay Bridge termination
libreoffice-4.1.6-bz1097646.patch (text/plain), 1.99 KB, created by
Siteshwar Vashisht
on 2014-05-15 15:39:53 UTC
(
hide
)
Description:
Don't unduly delay Bridge termination
Filename:
MIME Type:
Creator:
Siteshwar Vashisht
Created:
2014-05-15 15:39:53 UTC
Size:
1.99 KB
patch
obsolete
>diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx >index 5b463f5..8e8d4c8 100644 >--- a/binaryurp/source/bridge.cxx >+++ b/binaryurp/source/bridge.cxx >@@ -255,10 +255,18 @@ void Bridge::terminate(bool final) { > osl::MutexGuard g2(mutex_); > tp = threadPool_; > threadPool_ = 0; >- assert(!(reader_.is() && isThread(reader_.get()))); >- std::swap(reader_, r); >- assert(!(writer_.is() && isThread(writer_.get()))); >- std::swap(writer_, w); >+ if (reader_.is()) { >+ if (!isThread(reader_.get())) { >+ r = reader_; >+ } >+ reader_.clear(); >+ } >+ if (writer_.is()) { >+ if (!isThread(writer_.get())) { >+ w = writer_; >+ } >+ writer_.clear(); >+ } > state_ = STATE_FINAL; > } > assert(!(r.is() && w.is())); >diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx >index 522b165..d7fe5bb 100644 >--- a/binaryurp/source/reader.cxx >+++ b/binaryurp/source/reader.cxx >@@ -128,6 +128,7 @@ void Reader::execute() { > SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\''); > } > bridge_->terminate(false); >+ bridge_.clear(); > } > > void Reader::readMessage(Unmarshal & unmarshal) { >diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx >index 3d5c199..edcb0f5 100644 >--- a/binaryurp/source/writer.cxx >+++ b/binaryurp/source/writer.cxx >@@ -177,6 +177,7 @@ void Writer::execute() { > OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what()); > } > bridge_->terminate(false); >+ bridge_.clear(); > } > > void Writer::sendRequest(
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
sbergman
: review+
Actions:
View
|
Diff
Attachments on
bug 1097646
: 895995