From 8859c4d4710d977dc231e1fba7465951d2c44991 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Fri, 2 Jun 2017 11:25:04 +0200
Subject: [PATCH] blockingUDPTransport really join thread

---
 src/remote/blockingUDPTransport.cpp | 4 +---
 src/remote/pv/blockingUDP.h         | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/remote/blockingUDPTransport.cpp b/src/remote/blockingUDPTransport.cpp
index 80f42f7..e8fc8e3 100644
--- a/src/remote/blockingUDPTransport.cpp
+++ b/src/remote/blockingUDPTransport.cpp
@@ -163,7 +163,7 @@ void BlockingUDPTransport::close(bool waitForThreadToComplete) {
     // wait for send thread to exit cleanly
     if (_thread.get() && waitForThreadToComplete)
     {
-        if (!_shutdownEvent.wait(5.0))
+        if (!_thread->exitWait(5.0))
         {
             LOG(logLevelError,
                 "Receive thread for UDP socket %s has not exited.",
@@ -302,8 +302,6 @@ void BlockingUDPTransport::run() {
         string threadName = "UDP-rx "+inetAddressToString(_bindAddress);
         LOG(logLevelTrace, "Thread '%s' exiting.", threadName.c_str());
     }
-
-    _shutdownEvent.signal();
 }
 
 bool BlockingUDPTransport::processBuffer(Transport::shared_pointer const & transport,
diff --git a/src/remote/pv/blockingUDP.h b/src/remote/pv/blockingUDP.h
index 7e57250..ba3d79a 100644
--- a/src/remote/pv/blockingUDP.h
+++ b/src/remote/pv/blockingUDP.h
@@ -448,7 +448,6 @@ private:
      */
     epics::pvData::Mutex _mutex;
     epics::pvData::Mutex _sendMutex;
-    epics::pvData::Event _shutdownEvent;
 
     /**
      * Thread ID