Merge branch 'develop' into hotfix/add_FAQ_to_READMEhotfix/add_FAQ_to_README

1 files changed, 8 insertions, 0 deletions

diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc
index 2bb0fe10ec..60b01c901b 100644
--- a/src/components/media_manager/src/socket_streamer_adapter.cc
+++ b/src/components/media_manager/src/socket_streamer_adapter.cc
@@ -108,13 +108,21 @@ bool SocketStreamerAdapter::SocketStreamer::Connect() {
   return true;
 }
 
+void SocketStreamerAdapter::SocketStreamer::Close() {
+  Disconnect();
+}
+
 void SocketStreamerAdapter::SocketStreamer::Disconnect() {
   LOG4CXX_AUTO_TRACE(logger);
   if (0 < send_socket_fd_) {
+    shutdown(send_socket_fd_, SHUT_RDWR);
     close(send_socket_fd_);
+    send_socket_fd_ = 0;
   }
   if (0 < socket_fd_) {
+    shutdown(socket_fd_, SHUT_RDWR);
     close(socket_fd_);
+    socket_fd_ = 0;
   }
 }