diff --git a/src/remote/codec.cpp b/src/remote/codec.cpp index 3588af9..31e87b2 100644 --- a/src/remote/codec.cpp +++ b/src/remote/codec.cpp @@ -1045,9 +1045,6 @@ void BlockingTCPTransportCodec::close() { // Break sender from queue wait BreakTransport::shared_pointer B(new BreakTransport); enqueueSendRequest(B); - - // post close - internalPostClose(); } } @@ -1776,15 +1773,10 @@ void BlockingClientTCPTransportCodec::internalClose() { TimerCallbackPtr tcb = std::tr1::dynamic_pointer_cast(shared_from_this()); _context->getTimer()->cancel(tcb); -} - -void BlockingClientTCPTransportCodec::internalPostClose() { - BlockingTCPTransportCodec::internalPostClose(); // _owners cannot change when transport is closed closedNotifyClients(); } - /** * Notifies clients about disconnect. */ diff --git a/src/remote/pv/codec.h b/src/remote/pv/codec.h index f4dffa8..8f61c04 100644 --- a/src/remote/pv/codec.h +++ b/src/remote/pv/codec.h @@ -449,15 +449,11 @@ protected: virtual void sendBufferFull(int tries) OVERRIDE FINAL; /** - * Called from close(). prior to signaling worker shutdown. + * Called from close(). after start of shutdown (isOpen()==false) + * but before worker thread shutdown. */ virtual void internalClose(); - /** - * Called from close(). after signaling worker shutdown. - */ - virtual void internalPostClose() {} - private: AtomicValue _isOpen; epics::pvData::Thread _readThread, _sendThread; @@ -683,7 +679,6 @@ public: protected: virtual void internalClose() OVERRIDE FINAL; - virtual void internalPostClose() OVERRIDE FINAL; private: