Fix crash in ClusterListener::ReplayLog().

diff --git a/components/cluster/clusterlistener.cpp b/components/cluster/clusterlistener.cpp
index fb6af61173be1760e04b642ccc52e3a807519bf5..20fe633ec803d6c99874f2e365b629ea0cf1bb6d 100644 (file)
--- a/components/cluster/clusterlistener.cpp
+++ b/components/cluster/clusterlistener.cpp
@@ -443,9 +443,13 @@ void ClusterListener::ReplayLog(const Endpoint::Ptr& endpoint, const Stream::Ptr
 
                        String message;
                        while (true) {
+                               Dictionary::Ptr pmessage;
+
                                try {
                                        if (!NetString::ReadStringFromStream(lstream, &message))
                                                break;
+
+                                       pmessage = Value::Deserialize(message);
                                } catch (std::exception&) {
                                        Log(LogWarning, "cluster", "Unexpected end-of-file for cluster log: " + path);
 
@@ -453,8 +457,6 @@ void ClusterListener::ReplayLog(const Endpoint::Ptr& endpoint, const Stream::Ptr
                                        break;
                                }
 
-                               Dictionary::Ptr pmessage = Value::Deserialize(message);
-
                                if (pmessage->Get("timestamp") < peer_ts)
                                        continue;