[Libreoffice-commits] .: dbaccess/source

[Stephan Bergmann]

 dbaccess/source/core/dataaccess/documenteventnotifier.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 490f83d4807a4223bae61d34913e5bd2bf952f3a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 9 09:12:54 2012 +0100

    fdo#47021: the naive join attempt leads to deadlock
    
    ...something better is required (getting rid of the solar mutex?).

diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 2b7cf9b..2c10ff1 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -165,7 +165,12 @@ namespace dbaccess
         {
             m_pEventBroadcaster->removeEventsForProcessor( this );
             m_pEventBroadcaster->terminate();
-            m_pEventBroadcaster->join();
+                //TODO: a protocol is missing how to join with the thread before
+                // exit(3), to ensure the thread is no longer relying on any
+                // infrastructure while that infrastructure is being shut down
+                // in atexit handlers; simply calling join here leads to
+                // deadlock, as this thread holds the solar mutex while the
+                // other thread is typically blocked waiting for the solar mutex
             m_pEventBroadcaster.clear();
         }