oooimprovement7: #i116126# join logrotate thread upon terminate

dc7c582c · Bjoern Michaelsen · 082cd85b · dc7c582c
Kaydet (Commit) dc7c582c authored Ara 17, 2010 tarafından Bjoern Michaelsen
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

onlogrotate_job.cxx extensions/source/oooimprovement/onlogrotate_job.cxx +12 -3

No files found.
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -158,16 +158,25 @@ namespace
                m_Thread->create();
            }
            virtual ~OnLogRotateThreadWatcher()
-                { m_Thread->disposing()->terminate(); };
+            {
+                m_Thread->disposing()->terminate();
+                m_Thread->join();
+            };

            // XTerminateListener
            virtual void SAL_CALL queryTermination(const EventObject&) throw(RuntimeException)
                { };
            virtual void SAL_CALL notifyTermination(const EventObject&) throw(RuntimeException)
-                { m_Thread->disposing()->terminate(); };
+            {
+                m_Thread->disposing()->terminate();
+                m_Thread->join();
+            };
            // XEventListener
            virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException)
-                { m_Thread->disposing()->terminate(); };
+            {
+                m_Thread->disposing()->terminate();
+                m_Thread->join();
+            };
        private:
            ::std::auto_ptr<OnLogRotateThread> m_Thread;
    };