Merge branch 'development' of https://git01.codeplex.com/casablanca into 2.6.0bump

Author: stgates

CONTRIBUTORS.txt

@@ -17,6 +17,7 @@ intercommiura
 halex2005
 simonlep
 jracle
+gandziej 
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Release/src/http/listener/http_server_asio.cpp

@@ -853,21 +853,37 @@ pplx::task<void> http_linux_server::register_listener(details::http_listener_imp
     {
         pplx::extensibility::scoped_rw_lock_t lock(m_listeners_lock);
         if (m_registered_listeners.find(listener) != m_registered_listeners.end())
+        {
             throw std::invalid_argument("listener already registered");
+        }
 
-        m_registered_listeners[listener] = utility::details::make_unique<pplx::extensibility::reader_writer_lock_t>();
-
-        auto found_hostport_listener = m_listeners.find(hostport);
-        if (found_hostport_listener == m_listeners.end())
+        try
         {
-            found_hostport_listener = m_listeners.insert(
-                std::make_pair(hostport, utility::details::make_unique<details::hostport_listener>(this, hostport))).first;
+            m_registered_listeners[listener] = utility::details::make_unique<pplx::extensibility::reader_writer_lock_t>();
 
-            if (m_started)
-                found_hostport_listener->second->start();
-        }
+            auto found_hostport_listener = m_listeners.find(hostport);
+            if (found_hostport_listener == m_listeners.end())
+            {
+                found_hostport_listener = m_listeners.insert(
+                    std::make_pair(hostport, utility::details::make_unique<details::hostport_listener>(this, hostport))).first;
 
-        found_hostport_listener->second->add_listener(path, listener);
+                if (m_started)
+                {
+                    found_hostport_listener->second->start();
+                }
+            }
+
+            found_hostport_listener->second->add_listener(path, listener);
+        }
+        catch (...)
+        {
+            // Future improvement - really this API should entirely be asychronously.
+            // the hostport_listener::start() method should be made to return a task
+            // throwing the exception.
+            m_registered_listeners.erase(listener);
+            m_listeners.erase(hostport);
+            throw;
+        }
     }
 
     return pplx::task_from_result();