diff options
| author | fronneburg <fronneburg@xevo.com> | 2018-04-04 15:50:14 -0700 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-04-04 15:50:14 -0700 |
| commit | c513d50766a2d68080562984af5875adf696b6cd (patch) | |
| tree | 7b858d57ddf000ed5edbc3dd2ffbfc2957ebf7ab /src/components/connection_handler | |
| parent | 5eb11e2d54a3a5292ac6f1f01a031f1ef65b073f (diff) | |
| download | sdl_core-c513d50766a2d68080562984af5875adf696b6cd.tar.gz | |
minor changes due to merge build conflicts
Diffstat (limited to 'src/components/connection_handler')
| -rw-r--r-- | src/components/connection_handler/src/connection_handler_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index 5cb9fd3f27..1f61f66384 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -754,7 +754,7 @@ bool ConnectionHandlerImpl::OnSecondaryTransportStarted( KeyFromPair(primary_connection_handle, session_id); sync_primitives::AutoReadLock read_lock(connection_handler_observer_lock_); - if (connection_handler_observer_valid_ && connection_handler_observer_) { + if (connection_handler_observer_) { LOG4CXX_TRACE(logger_, "Calling Connection Handler Observer's OnSecondaryTransportStartedCallback"); connection_handler_observer_->OnSecondaryTransportStartedCallback( device_handle, session_key); @@ -795,7 +795,7 @@ void ConnectionHandlerImpl::OnSecondaryTransportEnded( { sync_primitives::AutoReadLock read_lock(connection_handler_observer_lock_); - if (connection_handler_observer_valid_ && connection_handler_observer_) { + if (connection_handler_observer_) { const uint32_t session_key = KeyFromPair(primary_connection_handle, session_id); |