Bugfix for the exception handling change.

diff --git a/jsonrpc/jsonrpcclient.cpp b/jsonrpc/jsonrpcclient.cpp
index e7f0f4c00b8424e7ac93cb7f27d4b9143a67e900..30b9e5b732352e291eaaa148d857a38a46059abc 100644 (file)
--- a/jsonrpc/jsonrpcclient.cpp
+++ b/jsonrpc/jsonrpcclient.cpp
@@ -23,12 +23,13 @@ int JsonRpcClient::DataAvailableHandler(const EventArgs& ea)
                try {
                        Message message;
 
-                       if (Netstring::ReadMessageFromFIFO(GetRecvQueue(), &message)) {
-                               NewMessageEventArgs nea;
-                               nea.Source = shared_from_this();
-                               nea.Message = message;
-                               OnNewMessage(nea);
-                       }
+                       if (!Netstring::ReadMessageFromFIFO(GetRecvQueue(), &message))
+                               break;
+
+                       NewMessageEventArgs nea;
+                       nea.Source = shared_from_this();
+                       nea.Message = message;
+                       OnNewMessage(nea);
                } catch (const Exception& ex) {
                        Application::Log("Exception while processing message from JSON-RPC client: " + ex.GetMessage());
                        Close();