jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #235 from pabigot/pr/235 

cleanup fixes in linux-tcp
This commit is contained in:
Emiel Bruijntjes 2018-06-24 18:12:31 +02:00 committed by GitHub
parent e665916b85 94bff62986
commit 68272312fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/amqpcpp/monitor.h
View File

@ -64,7 +64,25 @@ public:
Monitor(const Monitor &monitor) : _watchable(monitor._watchable)
{
// register with the watchable
_watchable->add(this);
if (_watchable) _watchable->add(this);
}
/**
* Assignment operator
* @param monitor
*/
Monitor& operator= (const Monitor &monitor)
{
// remove from watchable
if (_watchable) _watchable->remove(this);
// replace watchable
_watchable = monitor._watchable;
// register with the watchable
if (_watchable) _watchable->add(this);
return *this;
}
/**

10
src/linux_tcp/tcpresolver.h
View File

@ -194,7 +194,7 @@ public:
* Proceed to the next state
* @return TcpState *
*/
TcpState *proceed()
TcpState *proceed(const Monitor &monitor)
{
// do we have a valid socket?
if (_socket >= 0)
@ -211,6 +211,9 @@ public:
// report error
_handler->onError(_connection, _error.data());
// handler callback might have destroyed connection
if (!monitor.valid()) return nullptr;
// create dummy implementation
return new TcpClosed(_connection, _handler);
}
@ -229,7 +232,7 @@ public:
if (fd != _pipe.in() || !(flags & readable)) return this;
// proceed to the next state
return proceed();
return proceed(monitor);
}
/**
@ -243,7 +246,7 @@ public:
_thread.join();
// proceed to the next state
return proceed();
return proceed(monitor);
}
/**
@ -262,4 +265,3 @@ public:
* End of namespace
*/
}