address feedback: cache initialConnectionContext

Signed-off-by: Emelia Lei <[email protected]>

Author: emelialei88

src/groups/mqb/mqbnet/mqbnet_tcpsessionfactory.cpp

@@ -377,6 +377,10 @@ void TCPSessionFactory::handleInitialConnection(
                 bdlf::PlaceHolders::_5,  // initialConnectionContext
                 context));
 
+    // Cache the context.  It will be removed in 'initialConnectionComplete'.
+    d_initialConnectionContextCache[initialConnectionContext.get()] =
+        initialConnectionContext;
+
     // Register as observer of the channel to get the 'onClose'
     channel->onClose(
         bdlf::BindUtil::bindS(d_allocator_p,
@@ -554,8 +558,14 @@ void TCPSessionFactory::initialConnectionComplete(
         return;  // RETURN
     }
 
+    // Remove the cached InitialConnectionContext
+    BSLS_ASSERT_SAFE(
+        d_initialConnectionContextCache.contains(initialConnectionContext_p));
+    bsl::shared_ptr<InitialConnectionContext> initialConnectionContext_sp =
+        d_initialConnectionContextCache.at(initialConnectionContext_p);
+    d_initialConnectionContextCache.erase(initialConnectionContext_p);
+
     // Successful negotiation
-    BSLS_ASSERT_SAFE(initialConnectionContext_p);
     BSLS_ASSERT_SAFE(initialConnectionContext_p->negotiationContext());
 
     BALL_LOG_INFO

src/groups/mqb/mqbnet/mqbnet_tcpsessionfactory.h

@@ -269,6 +269,10 @@ class TCPSessionFactory {
 
     typedef bslma::ManagedPtr<bmqio::StatChannelFactory> StatChannelFactoryMp;
 
+    typedef bsl::unordered_map<const InitialConnectionContext*,
+                               bsl::shared_ptr<InitialConnectionContext> >
+        InitialConnectionContextMp;
+
     typedef TCPSessionFactory_OperationContext OperationContext;
 
     typedef bsl::shared_ptr<bmqio::ChannelFactory::OpHandle> OpHandleSp;
@@ -319,6 +323,14 @@ class TCPSessionFactory {
 
     StatChannelFactoryMp d_statChannelFactory_mp;
 
+    /// Cache of shared pointers to @bbref{mqbnet::InitialConnectionContext} to
+    /// preserve their lifetime while an initial connection
+    /// (authentication/negotiation) is in progress.  Each context is added by
+    /// @bbref{handleInitialConnection} and removed by
+    /// @bbref{initialConnectionComplete} once negotiation finishes (success or
+    /// failure).
+    InitialConnectionContextMp d_initialConnectionContextCache;
+
     /// Name to use for the IO threads
     bsl::string d_threadName;