# # patch "cvs_client.cc" # from [7799a14f2026f9fc936fee6d92fbb9396ebd697c] # to [2d2d69186b10d762263f54d78213003d10554183] # ======================================================================== --- cvs_client.cc 7799a14f2026f9fc936fee6d92fbb9396ebd697c +++ cvs_client.cc 2d2d69186b10d762263f54d78213003d10554183 @@ -747,7 +747,7 @@ va_copy(ap2,ap); try { Log_internal(cb,file,ap); - } catch (oops &e) + } catch (...) { W(F("trying to reconnect, perhaps the server is confused\n")); reconnect(); Log_internal(cb,file,ap2); @@ -758,7 +758,13 @@ void cvs_client::Log(const rlog_callbacks &cb,std::string const& file, std::vector const& args) { primeModules(); + try { Log_internal(cb,file,args); + } catch (...) + { W(F("trying to reconnect, perhaps the server is confused\n")); + reconnect(); + Log_internal(cb,file,args); + } } // dummy is needed to satisfy va_start (cannot pass objects of non-POD type)