Merge branch 'RTSDK-9816' into release

Author: soranat

Cpp-C/Eta/Impl/Reactor/rsslReactor.c

@@ -6156,7 +6156,7 @@ static RsslRet _reactorDispatchEventFromQueue(RsslReactorImpl *pReactorImpl, Rss
 								pReactorTokenMgntEvent->reactorAuthTokenEvent.statusCode = pTokenSession->httpStatusCode;
 
 								// The current channel could be a WSB connection that has transitioned to the channel list, so set up the main channel here.
-								if (pReactorChannel->reactorChannel.pWarmStandbyChInfo != NULL)
+								if (pReactorChannel && pReactorChannel->reactorChannel.pWarmStandbyChInfo != NULL)
 								{
 									pCallbackChannel = &pReactorChannel->pWarmStandByHandlerImpl->mainReactorChannelImpl.reactorChannel;
 									_reactorSetupMainWSBReactorChannel(pCallbackChannel, pReactorChannel);
@@ -6197,7 +6197,7 @@ static RsslRet _reactorDispatchEventFromQueue(RsslReactorImpl *pReactorImpl, Rss
 							pReactorTokenMgntEvent->reactorAuthTokenEvent.statusCode = pReactorChannel ? pTokenSession->httpStatusCode : pReactorOAuthCredentialRenewalImpl->httpStatusCode;
 
 							// The current channel could be a WSB connection that has transitioned to the channel list, so set up the main channel here.
-							if (pReactorChannel->reactorChannel.pWarmStandbyChInfo != NULL)
+							if (pReactorChannel && pReactorChannel->reactorChannel.pWarmStandbyChInfo != NULL)
 							{
 								pCallbackChannel = &pReactorChannel->pWarmStandByHandlerImpl->mainReactorChannelImpl.reactorChannel;
 								_reactorSetupMainWSBReactorChannel(pCallbackChannel, pReactorChannel);
@@ -6274,7 +6274,7 @@ static RsslRet _reactorDispatchEventFromQueue(RsslReactorImpl *pReactorImpl, Rss
 						/* Send login message only when the watchlist is enable. 
 							Note: Unlike above, this should never be sent in the preferred host case.
 						*/
-						if (pReactorChannel->pWatchlist && pReactorChannel->channelRole.ommConsumerRole.pLoginRequest)
+						if (pReactorChannel && pReactorChannel->pWatchlist && pReactorChannel->channelRole.ommConsumerRole.pLoginRequest)
 						{
 							rsslWatchlistClearProcessMsgOptions(&processOpts);
 							processOpts.pRdmMsg = (RsslRDMMsg*)pReactorChannel->channelRole.ommConsumerRole.pLoginRequest;
@@ -6303,7 +6303,7 @@ static RsslRet _reactorDispatchEventFromQueue(RsslReactorImpl *pReactorImpl, Rss
 							pReactorTokenMgntEvent->reactorAuthTokenEvent.statusCode = pReactorOAuthCredentialRenewalImpl->httpStatusCode;
 
 							// The current channel could be a WSB connection that has transitioned to the channel list, so set up the main channel here.
-							if (pReactorChannel->reactorChannel.pWarmStandbyChInfo != NULL)
+							if (pReactorChannel && pReactorChannel->reactorChannel.pWarmStandbyChInfo != NULL)
 							{
 								pCallbackChannel = &pReactorChannel->pWarmStandByHandlerImpl->mainReactorChannelImpl.reactorChannel;
 								_reactorSetupMainWSBReactorChannel(pCallbackChannel, pReactorChannel);

Cpp-C/Eta/TestTools/UnitTests/rsslVATest/reactorUnitTests.cpp

@@ -2242,7 +2242,7 @@ TEST_F(ReactorSessionMgntTest, ConnectionRecoveryFromSocketToEncrypted_Unauthori
 	/* Wait until the connection is switched successfully to the encrypted connection */
 	ASSERT_TRUE(dispatchEvent(pConsMon, 10000) >= RSSL_RET_SUCCESS);
 	time_sleep(2000);
-	ASSERT_TRUE(dispatchEvent(pConsMon, 3000) >= RSSL_RET_SUCCESS);
+	dispatchEvent(pConsMon, 3000);
 
 	/* Check for token information */
 	ASSERT_TRUE(pConsMon->authEventStatusCode == 400);
@@ -2382,7 +2382,7 @@ TEST_P(ReactorSessionMgntTest, ConnectionRecoveryFromSocketToEncrypted_InvalidAu
 	/* Wait until the connection is switched successfully to the encrypted connection */
 	ASSERT_TRUE(dispatchEvent(pConsMon, 8000) >= RSSL_RET_SUCCESS);
 	time_sleep(2000);
-	ASSERT_TRUE(dispatchEvent(pConsMon, 3000) >= RSSL_RET_SUCCESS);
+	dispatchEvent(pConsMon, 3000);
 
 	/* Check for token information */
 	ASSERT_TRUE(pConsMon->authEventStatusCode == 0); /* No HTTP response status code as the URL is invalid*/