summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSho Amano <samano@xevo.com>2018-06-25 13:32:03 +0900
committerSho Amano <samano@xevo.com>2018-06-25 13:32:51 +0900
commit88a94b2df4cc9eb527b579d2f37c7a90317570bb (patch)
tree43ab6b0ba33ed2342290e5459539e9dcdc45de0f /src
parentaeb404345122c1181627a0a2cbaaf893726e22e7 (diff)
downloadsdl_core-88a94b2df4cc9eb527b579d2f37c7a90317570bb.tar.gz
Partially revert "fix build problems from merges" again
This reverts a change in ConnectionHandlerImpl of commit 9b7658d79d041428d502b3d99791263473c51b73, which was to workaround a build failure with ENABLE_SECURITY=OFF. The issue has been resolved with latest develop so the workaround is no longer needed.
Diffstat (limited to 'src')
-rw-r--r--src/components/connection_handler/src/connection_handler_impl.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index a50d46e2ec..660dc723b9 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -466,11 +466,8 @@ void ConnectionHandlerImpl::OnSessionStartedCallback(
}
Connection* connection = it->second;
-
-#ifdef ENABLE_SECURITY
context.is_new_service_ =
!connection->SessionServiceExists(session_id, service_type);
-#endif // ENABLE_SECURITY
if ((0 == session_id) && (protocol_handler::kRpc == service_type)) {
context.new_session_id_ =