Merge "1. In UdpServer HandleReceive/SendInternal do not deallocate t…

…he buffer if the UdpServer state is not OK since it will already be freed during Shutdown. This was uncovered during coverage runs. 2. Fix SyslogCollectorTest crash when running multiple iterations by moving Sandesh::Uninit before the thread join in Teardown(). Ran 100 iterations without any crash."
Juniper · Sep 24, 2014 · 50aa9b0 · 50aa9b0
2 parents c8af3f2 + 25cde0b
commit 50aa9b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/analytics/test/syslog_test.cc b/src/analytics/test/syslog_test.cc
@@ -147,10 +147,11 @@ class SyslogCollectorTest : public ::testing::Test
         task_util::WaitForIdle();
         evm_->Shutdown();
         task_util::WaitForIdle();
+        Sandesh::Uninit();
+        task_util::WaitForIdle();
         if (thread_.get() != NULL) {
             thread_->Join();
         }
-        Sandesh::Uninit();
         task_util::WaitForIdle();
     }
     SyslogMsgGen                   *gen_;

diff --git a/src/io/udp_server.cc b/src/io/udp_server.cc
@@ -197,7 +197,6 @@ void UdpServer::HandleSendInternal(const_buffer send_buffer,
         stats_.write_errors++;
         UDP_SERVER_LOG_ERROR(this, UDP_DIR_OUT,
             "Send UDP server in WRONG state: " << state_);
-        DeallocateBuffer(send_buffer);
         return;
     }
     if (error) {
@@ -238,7 +237,6 @@ void UdpServer::HandleReceiveInternal(const_buffer recv_buffer,
         stats_.read_errors++;
         UDP_SERVER_LOG_ERROR(this, UDP_DIR_IN,
             "Receive UDP server in WRONG state: " << state_);
-        DeallocateBuffer(recv_buffer);
         return;
     }
     if (error) {