Skip to content

Commit f976fc8

Browse files
committed
Fixing up some white spacing and adding to contributors file.
1 parent 0d373a3 commit f976fc8

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

CONTRIBUTORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ intercommiura
1717
halex2005
1818
simonlep
1919
jracle
20+
gandziej
2021

2122
AutoDesk Inc.
2223
Cyrille Fauvel (cyrillef)

Release/src/http/listener/http_server_asio.cpp

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -853,10 +853,12 @@ pplx::task<void> http_linux_server::register_listener(details::http_listener_imp
853853
{
854854
pplx::extensibility::scoped_rw_lock_t lock(m_listeners_lock);
855855
if (m_registered_listeners.find(listener) != m_registered_listeners.end())
856+
{
856857
throw std::invalid_argument("listener already registered");
858+
}
857859

858-
try
859-
{
860+
try
861+
{
860862
m_registered_listeners[listener] = utility::details::make_unique<pplx::extensibility::reader_writer_lock_t>();
861863

862864
auto found_hostport_listener = m_listeners.find(hostport);
@@ -866,17 +868,22 @@ pplx::task<void> http_linux_server::register_listener(details::http_listener_imp
866868
std::make_pair(hostport, utility::details::make_unique<details::hostport_listener>(this, hostport))).first;
867869

868870
if (m_started)
871+
{
869872
found_hostport_listener->second->start();
873+
}
870874
}
871875

872876
found_hostport_listener->second->add_listener(path, listener);
873-
}
874-
catch(...) //naive solution
875-
{
876-
m_registered_listeners.erase(listener);
877-
m_listeners.erase(hostport);
878-
throw;
879-
}
877+
}
878+
catch (...)
879+
{
880+
// Future improvement - really this API should entirely be asychronously.
881+
// the hostport_listener::start() method should be made to return a task
882+
// throwing the exception.
883+
m_registered_listeners.erase(listener);
884+
m_listeners.erase(hostport);
885+
throw;
886+
}
880887
}
881888

882889
return pplx::task_from_result();

0 commit comments

Comments
 (0)