diff --git a/erizo/src/erizo/pipeline/Pipeline-inl.h b/erizo/src/erizo/pipeline/Pipeline-inl.h index f816b68ba4..521311bce7 100644 --- a/erizo/src/erizo/pipeline/Pipeline-inl.h +++ b/erizo/src/erizo/pipeline/Pipeline-inl.h @@ -63,10 +63,6 @@ PipelineBase& PipelineBase::removeHelper(H* handler, bool checkEqual) { } } - if (!removed) { - throw std::invalid_argument("No such handler in pipeline"); - } - return *this; } @@ -189,10 +185,6 @@ void PipelineBase::removeService() { } } } - - if (!removed) { - throw std::invalid_argument("No such handler in pipeline"); - } } diff --git a/erizo/src/erizo/pipeline/Pipeline.cpp b/erizo/src/erizo/pipeline/Pipeline.cpp index 6d15df0fed..e1a1e31eea 100644 --- a/erizo/src/erizo/pipeline/Pipeline.cpp +++ b/erizo/src/erizo/pipeline/Pipeline.cpp @@ -37,7 +37,7 @@ PipelineBase::ContextIterator PipelineBase::removeAt( PipelineBase& PipelineBase::removeFront() { if (ctxs_.empty()) { - throw std::invalid_argument("No handlers in pipeline"); + return *this; } removeAt(ctxs_.begin()); return *this; @@ -45,7 +45,7 @@ PipelineBase& PipelineBase::removeFront() { PipelineBase& PipelineBase::removeBack() { if (ctxs_.empty()) { - throw std::invalid_argument("No handlers in pipeline"); + return *this; } removeAt(--ctxs_.end()); return *this; diff --git a/erizo/src/erizo/thread/Scheduler.cpp b/erizo/src/erizo/thread/Scheduler.cpp index 4d19d7f0fd..a5fba22fdd 100644 --- a/erizo/src/erizo/thread/Scheduler.cpp +++ b/erizo/src/erizo/thread/Scheduler.cpp @@ -48,7 +48,7 @@ void Scheduler::serviceQueue() { lock.lock(); } catch (...) { --n_threads_servicing_queue_; - throw; + assert(false && "An exception has been thrown inside Scheduler"); } } --n_threads_servicing_queue_;