Skip to content

C
core
Kaydet (Commit) dc7c582c authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen
Dosyalara gözat
Seçenekler

oooimprovement7: #i116126# join logrotate thread upon terminate

üst 082cd85b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
extensions/source/oooimprovement/onlogrotate_job.cxx
Dosyayı görüntüle @ dc7c582c
...@@ -158,16 +158,25 @@ namespace ...@@ -158,16 +158,25 @@ namespace
m_Thread->create(); m_Thread->create();
} }
virtual ~OnLogRotateThreadWatcher() virtual ~OnLogRotateThreadWatcher()
{ m_Thread->disposing()->terminate(); }; {
m_Thread->disposing()->terminate();
m_Thread->join();
};
// XTerminateListener // XTerminateListener
virtual void SAL_CALL queryTermination(const EventObject&) throw(RuntimeException) virtual void SAL_CALL queryTermination(const EventObject&) throw(RuntimeException)
{ }; { };
virtual void SAL_CALL notifyTermination(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 // XEventListener
virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException) virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException)
{ m_Thread->disposing()->terminate(); }; {
m_Thread->disposing()->terminate();
m_Thread->join();
};
private: private:
::std::auto_ptr<OnLogRotateThread> m_Thread; ::std::auto_ptr<OnLogRotateThread> m_Thread;
}; };
......
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