Adjust exception classes and messages

[libs/net.git] / source / http / client.cpp

diff --git a/source/http/client.cpp b/source/http/client.cpp
index 6f221810c922a78f85289934b36ce4d6b71b2100..705f4cb7bbd0a7e09dcdbcde3dc979e9bf0cae86 100644 (file)
--- a/source/http/client.cpp
+++ b/source/http/client.cpp
@@ -1,6 +1,7 @@
+#include <msp/core/except.h>
 #include <msp/core/refptr.h>
 #include <msp/net/resolve.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include "client.h"
 #include "request.h"
 #include "response.h"
@@ -53,7 +54,7 @@ void Client::use_resolver(Net::Resolver *r)
 void Client::start_request(const Request &r)
 {
        if(request)
-               throw client_busy();
+               throw invalid_state("already processing a request");
 
        delete sock;
        sock = 0;
@@ -141,23 +142,39 @@ void Client::resolve_failed(unsigned tag, const exception &err)
                return;
        resolve_tag = 0;
 
-       signal_socket_error.emit(err);
-
        delete request;
        request = 0;
+
+       if(signal_socket_error.empty())
+               throw err;
+       signal_socket_error.emit(err);
 }
 
 void Client::connect_finished(const exception *err)
 {
        if(err)
        {
-               signal_socket_error.emit(*err);
-
                delete request;
                request = 0;
+
+               if(signal_socket_error.empty())
+                       throw *err;
+               signal_socket_error.emit(*err);
        }
        else
-               sock->write(request->str());
+       {
+               try
+               {
+                       sock->write(request->str());
+               }
+               catch(const exception &e)
+               {
+                       if(signal_socket_error.empty())
+                               throw;
+                       signal_socket_error.emit(e);
+                       return;
+               }
+       }
 }
 
 void Client::data_available()
@@ -170,6 +187,8 @@ void Client::data_available()
        }
        catch(const exception &e)
        {
+               if(signal_socket_error.empty())
+                       throw;
                signal_socket_error.emit(e);
                return;
        }