#5 make sure we always return incoming handler

4 years ago · 06fc2aefb9
parent 8a97101e08
commit 06fc2aefb9
2 changed files with 8 additions and 0 deletions
--- a/DCSProtocolHandlerPool.cpp
+++ b/DCSProtocolHandlerPool.cpp
@ -44,6 +44,10 @@ CDCSProtocolHandlerPool::~CDCSProtocolHandlerPool()

 CDCSProtocolHandler *CDCSProtocolHandlerPool::getIncomingHandler()
 {
+	auto it = m_pool.find(m_basePort);
+	if(it != m_pool.end())
+		return it->second;
+		
 	return getHandler(m_basePort);
 }

--- a/DPlusProtocolHandlerPool.cpp
+++ b/DPlusProtocolHandlerPool.cpp
@ -44,6 +44,10 @@ CDPlusProtocolHandlerPool::~CDPlusProtocolHandlerPool()

 CDPlusProtocolHandler* CDPlusProtocolHandlerPool::getIncomingHandler()
 {
+	auto it = m_pool.find(m_basePort);
+	if(it != m_pool.end())
+		return it->second;
+
 	return getHandler(m_basePort);
 }