From 946a82d5f994aab694048761e761fef946a49e8e Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Mon, 29 Dec 2014 12:52:10 +0300
Subject: [PATCH] Remove lock in BuildRoute/RebuildRoute methods.

---
 map/routing_session.cpp | 15 ++-------------
 map/routing_session.hpp |  2 --
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/map/routing_session.cpp b/map/routing_session.cpp
index abd8283c2f..76caea81a5 100644
--- a/map/routing_session.cpp
+++ b/map/routing_session.cpp
@@ -26,27 +26,16 @@ RoutingSession::RoutingSession()
 void RoutingSession::BuildRoute(m2::PointD const & startPoint, m2::PointD const & endPoint,
                                 TReadyCallbackFn const & callback)
 {
-  threads::MutexGuard guard(m_routeSessionMutex);
-  UNUSED_VALUE(guard);
-
   ASSERT(m_router != nullptr, ());
   m_lastGoodPosition = startPoint;
   m_router->SetFinalPoint(endPoint);
-  RebuildRouteUnprotected(startPoint, callback);
+  RebuildRoute(startPoint, callback);
 }
 
 void RoutingSession::RebuildRoute(m2::PointD const & startPoint, TReadyCallbackFn const & callback)
-{
-  threads::MutexGuard guard(m_routeSessionMutex);
-  UNUSED_VALUE(guard);
-
-  RebuildRouteUnprotected(startPoint, callback);
-}
-
-void RoutingSession::RebuildRouteUnprotected(m2::PointD const & startPoint, TReadyCallbackFn const & callback)
 {
   ASSERT(m_router != nullptr, ());
-  ResetUnprotected();
+  Reset();
   m_state = RouteBuilding;
 
   // Use old-style callback constraction, because lambda constructs buggy function on Android
diff --git a/map/routing_session.hpp b/map/routing_session.hpp
index 80f86db29b..e773e8611c 100644
--- a/map/routing_session.hpp
+++ b/map/routing_session.hpp
@@ -63,8 +63,6 @@ public:
 
 private:
   void ResetUnprotected();
-  void RebuildRouteUnprotected(m2::PointD const & startPoint, TReadyCallbackFn const & callback);
-
   struct DoReadyCallback
   {
     RoutingSession & m_rs;