From: Piotr Kosko <p.kosko@samsung.com>
Date: Fri, 31 Mar 2017 09:08:20 +0000 (+0200)
Subject: [Convergence] Fixing SVACE issue
X-Git-Tag: submit/tizen_3.0/20170405.081152~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F122428%2F2;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Convergence] Fixing SVACE issue

[Verification] Code compiles without errors.

Change-Id: If7ee6db3ab6939160bfec11f0afe365b606393cc
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>
---

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<ConvergenceChannel*>::iterator ConvergenceService::GetChannel(const picojson::value &channel_json) {
   ScopeLogger();
-
-  std::vector<ConvergenceChannel*>::iterator it;
   const auto id = channel_json.get(kId).get<std::string>();
   const auto uri = channel_json.get(kUri).get<std::string>();
 
-  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<ConvergenceChannel*>::iterator it) {