From c64d8b343c505fb8046fb31b6eeb594d6f0e5a53 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Thu, 6 Oct 2011 21:25:58 +0200 Subject: [PATCH] destroy cleanup --- pvAccessApp/remote/blockingServerTCPTransport.cpp | 2 +- pvAccessApp/remote/blockingTCPTransport.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pvAccessApp/remote/blockingServerTCPTransport.cpp b/pvAccessApp/remote/blockingServerTCPTransport.cpp index b2ce4bc..a763ba7 100644 --- a/pvAccessApp/remote/blockingServerTCPTransport.cpp +++ b/pvAccessApp/remote/blockingServerTCPTransport.cpp @@ -71,7 +71,7 @@ namespace epics { } void BlockingServerTCPTransport::internalPostClose(bool forced) { - BlockingTCPTransport::internalClose(forced); + BlockingTCPTransport::internalPostClose(forced); } pvAccessID BlockingServerTCPTransport::preallocateChannelSID() { diff --git a/pvAccessApp/remote/blockingTCPTransport.cpp b/pvAccessApp/remote/blockingTCPTransport.cpp index b61c465..d07e4ad 100644 --- a/pvAccessApp/remote/blockingTCPTransport.cpp +++ b/pvAccessApp/remote/blockingTCPTransport.cpp @@ -281,7 +281,6 @@ namespace epics { // close the socket if(_channel!=INVALID_SOCKET) { epicsSocketDestroy(_channel); - _channel = INVALID_SOCKET; } } @@ -957,11 +956,12 @@ namespace epics { LOG(logLevelDebug, "Connection to %s closed.", inetAddressToString(_socketAddress).c_str()); - +/* if(_channel!=INVALID_SOCKET) { epicsSocketDestroy(_channel); _channel = INVALID_SOCKET; } +*/ } void BlockingTCPTransport::rcvThreadRunner(void* param) {