address review comments

2 files changed, 4 insertions, 5 deletions

diff --git a/src/components/connection_handler/src/connection.cc b/src/components/connection_handler/src/connection.cc
index b926234b9c..b8399b2c9b 100644
--- a/src/components/connection_handler/src/connection.cc
+++ b/src/components/connection_handler/src/connection.cc
@@ -123,14 +123,13 @@ uint32_t Connection::AddNewSession(
     const transport_manager::ConnectionUID connection_handle) {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  // Even though we have our own SessionMap, we use the Connection Handler's
-  // SessionConnectionMap to generate a session ID. We want to make sure that
-  // session IDs are globally unique, and not only unique within a Connection.
-
   // NESTED LOCK: make sure to lock session_map_lock_ then ConnectionHandler's
   // session_connection_map_lock_ptr_ (which will be taken in AddSession)
   sync_primitives::AutoLock lock(session_map_lock_);
 
+  // Even though we have our own SessionMap, we use the Connection Handler's
+  // SessionConnectionMap to generate a session ID. We want to make sure that
+  // session IDs are globally unique, and not only unique within a Connection.
   const uint32_t session_id =
       connection_handler_->AddSession(connection_handle);
   if (session_id > 0) {
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index 523bdadea0..6548f86c6a 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -2538,7 +2538,7 @@ void ProtocolHandlerImpl::GenerateServiceTransportsForStartSessionAck(
   LOG4CXX_AUTO_TRACE(logger_);
 
   if (service_transports.size() == 0) {
-    if (secondary_enabled) {
+    if (secondary_enabled && !secondary_transport_types.empty()) {
       LOG4CXX_TRACE(logger_,
                     "Empty Service Transports. Allowing service to run on both "
                     "connections");