[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp

[Michael Meeks]

 loolwsd/LOOLWSD.cpp |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5e9b582ed4d74a9d343f96cc0899aba452f31654
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Nov 2 00:46:17 2016 +0000

    loolwsd: avoid ordering issues with atexit handlers.
    
    Otherwise Admin::instance() has been destroyed by the time we're
    cleaning up the DocumentBrokers resulting in FMRs etc.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1907cf3..2a74663 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -2088,6 +2088,9 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
         Poco::Crypto::uninitializeCrypto();
     }
 
+    // atexit handlers tend to free Admin before Documents
+    Log::info("Cleaning up lingering documents.");
+    DocBrokers.clear();
 
     Log::info("Process [loolwsd] finished.");