From 336cf253b985df0b03967dc9ebb610e31f330468 Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Fri, 31 Mar 2017 11:08:20 +0200 Subject: [PATCH] [Convergence] Fixing SVACE issue [Verification] Code compiles without errors. Change-Id: If7ee6db3ab6939160bfec11f0afe365b606393cc Signed-off-by: Piotr Kosko --- src/convergence/convergence_service.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/convergence/convergence_service.cc b/src/convergence/convergence_service.cc index 4f9167e0..29992d7b 100644 --- a/src/convergence/convergence_service.cc +++ b/src/convergence/convergence_service.cc @@ -190,19 +190,17 @@ picojson::value ConvergenceService::ToJson() const { std::vector::iterator ConvergenceService::GetChannel(const picojson::value &channel_json) { ScopeLogger(); - - std::vector::iterator it; const auto id = channel_json.get(kId).get(); const auto uri = channel_json.get(kUri).get(); - for (it = opened_channels.begin(); it != opened_channels.end(); ++it) { + for (auto it = opened_channels.begin(); it != opened_channels.end(); ++it) { if((*it)->GetUri() == uri && (*it)->GetId() == id) { LoggerD("Found channel uri: [%s] id: [%s]", uri.c_str(), id.c_str()); - break; + return it; } } - return it; + return opened_channels.end(); } bool ConvergenceService::IsChannelStarted(std::vector::iterator it) { -- 2.34.1