Don't throw an exception if reading a encode server response fails (#2320).

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 200286fd94426e945c32cff7c37b8dc0867a47bd..e01019a8c92f9c1747bef9d6bba7d0f77fa1d19a 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -220,16 +220,24 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec)
                return;
        }
 
-       uint32_t length;
-       _accept_socket->read (reinterpret_cast<uint8_t*>(&length), sizeof(uint32_t));
-       length = ntohl (length);
+       string server_available;
 
-       scoped_array<char> buffer(new char[length]);
-       _accept_socket->read (reinterpret_cast<uint8_t*>(buffer.get()), length);
+       try {
+               uint32_t length;
+               _accept_socket->read (reinterpret_cast<uint8_t*>(&length), sizeof(uint32_t));
+               length = ntohl (length);
+
+               scoped_array<char> buffer(new char[length]);
+               _accept_socket->read (reinterpret_cast<uint8_t*>(buffer.get()), length);
+               server_available = buffer.get();
+       } catch (NetworkError&) {
+               /* Maybe the server went away; let's just try again */
+               start_accept();
+               return;
+       }
 
-       string s (buffer.get());
        auto xml = make_shared<cxml::Document>("ServerAvailable");
-       xml->read_string (s);
+       xml->read_string(server_available);
 
        auto const ip = _accept_socket->socket().remote_endpoint().address().to_string();
        bool changed = false;