Commit d8f748e1 authored by Pavel Vainerman's avatar Pavel Vainerman

(TCPCheck): исправил ошибку с SIGSEGV при завершении потока

parent 2a392918
......@@ -507,6 +507,7 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# history of current unpublished changes
# Modbus: refactoring code and test (for 64bit)
# iobase: refactoring tests for 64bit
# TCPCheck: fixed bug (for exit thread)
%changelog
* Mon Dec 12 2016 Pavel Vainerman <pv@altlinux.ru> 2.6-alt6
......
......@@ -156,13 +156,13 @@ namespace uniset
private:
ThreadCreator();
ThreadMaster* m;
ThreadMaster* m = { nullptr };
Action act;
ThreadMaster* finm;
ThreadMaster* finm = { nullptr };
Action finact;
ThreadMaster* initm;
ThreadMaster* initm = { nullptr };
Action initact;
Poco::Thread thr;
......@@ -173,10 +173,10 @@ namespace uniset
ThreadCreator<ThreadMaster>::ThreadCreator( ThreadMaster* m, Action a ):
m(m),
act(a),
finm(0),
finact(0),
initm(0),
initact(0)
finm(nullptr),
finact(nullptr),
initm(nullptr),
initact(nullptr)
{
}
//----------------------------------------------------------------------------------------
......
......@@ -63,6 +63,8 @@ namespace uniset
{
if( t.isRunning() )
t.stop();
t.join();
}
protected:
......
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