summaryrefslogtreecommitdiff
path: root/src/components/media_manager/src/streamer_adapter.cc
diff options
context:
space:
mode:
authorArtem Nosach <ANosach@luxoft.com>2015-08-03 21:28:03 +0300
committerArtem Nosach <ANosach@luxoft.com>2015-10-04 18:08:49 +0300
commitcbe8c0c4efe065c211141a76dc016efd7ceb5d31 (patch)
tree32b1fefbe8fe8f9bac1e228f5d99ddef1b1bd6be /src/components/media_manager/src/streamer_adapter.cc
parent065c5b6508b59e08b758fef58d770b828dab11f8 (diff)
downloadsdl_core-cbe8c0c4efe065c211141a76dc016efd7ceb5d31.tar.gz
Check for empty queue in MessageQueue::pop() method
Return bool value from MessageQueue::pop() method that shows if pop operation was successful. Add default constructors to all classes used as message for message queue. Closes-bug: APPLINK-14928
Diffstat (limited to 'src/components/media_manager/src/streamer_adapter.cc')
-rw-r--r--src/components/media_manager/src/streamer_adapter.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/media_manager/src/streamer_adapter.cc b/src/components/media_manager/src/streamer_adapter.cc
index ef128a4417..3246744ba9 100644
--- a/src/components/media_manager/src/streamer_adapter.cc
+++ b/src/components/media_manager/src/streamer_adapter.cc
@@ -131,7 +131,11 @@ void StreamerAdapter::Streamer::threadMain() {
while (!stop_flag_) {
adapter_->messages_.wait();
while (!adapter_->messages_.empty()) {
- protocol_handler::RawMessagePtr msg = adapter_->messages_.pop();
+ protocol_handler::RawMessagePtr msg;
+ if (!adapter_->messages_.pop(msg)) {
+ LOG4CXX_ERROR(logger, "Empty message queue");
+ continue;
+ }
if (!msg) {
LOG4CXX_ERROR(logger, "Null pointer message");
continue;