Skip to content

Commit 0b99c4c

Browse files
authored
Merge pull request #136 from c-jimenez/fix/various_fixes
[websocket] Fix return values for websocket factory start/stop
2 parents d442e7b + 58474fd commit 0b99c4c

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

examples/common/config/OcppConfig.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
200200
std::size_t key_is_interval = key.find("Interval");
201201
if (key_is_interval != std::string::npos)
202202
{
203-
std::size_t value_is_negative = key.find("-");
204-
if (value_is_negative)
203+
std::size_t value_is_negative = value.find("-");
204+
if (value_is_negative != std::string::npos)
205205
{
206206
ret = ConfigurationStatus::Rejected;
207207
}

src/rpc/RpcBase.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ void RpcBase::start()
231231
{
232232
// Start reception thread
233233
m_requests_queue.setEnable(true);
234+
m_results_queue.setEnable(true);
234235
m_rx_thread = new std::thread(std::bind(&RpcBase::rxThread, this));
235236
}
236237
}

src/websockets/WebsocketFactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ bool WebsocketFactory::setClientPoolCount(size_t count)
9898
/** @brief Start the client pools */
9999
bool WebsocketFactory::startClientPools()
100100
{
101-
bool ret = false;
101+
bool ret = true;
102102

103103
std::lock_guard<std::mutex> lock(s_client_pools_mutex);
104104
if (!s_client_pools.empty())
@@ -115,7 +115,7 @@ bool WebsocketFactory::startClientPools()
115115
/** @brief Stop the client pools */
116116
bool WebsocketFactory::stopClientPools()
117117
{
118-
bool ret = false;
118+
bool ret = true;
119119

120120
std::lock_guard<std::mutex> lock(s_client_pools_mutex);
121121
if (!s_client_pools.empty())

0 commit comments

Comments
 (0)