Fixed messageqeue and storage. Empty scan is not an error.

1 files changed, 13 insertions, 3 deletions

diff --git a/common/messagequeue.cpp b/common/messagequeue.cpp
index e1bde4b..99a0112 100644
--- a/common/messagequeue.cpp
+++ b/common/messagequeue.cpp
@@ -21,8 +21,13 @@ void MessageQueue::enqueue(void const *msg, size_t size)
 void MessageQueue::dequeue(const std::function<void(void *ptr, int size, std::function<void(bool success)>)> &resultHandler,
                            const std::function<void(const Error &error)> &errorHandler)
 {
-    mStorage.scan("", 0, [this, resultHandler](void *keyPtr, int keySize, void *valuePtr, int valueSize) -> bool {
-        const std::string key(static_cast<char*>(keyPtr), keySize);
+    bool readValue = false;
+    mStorage.scan("", 0, [this, resultHandler, &readValue](void *keyPtr, int keySize, void *valuePtr, int valueSize) -> bool {
+        const auto key  = QByteArray::fromRawData(static_cast<char*>(keyPtr), keySize);
+        if (key.startsWith("__internal")) {
+            return true;
+        }
+        readValue = true;
         resultHandler(valuePtr, valueSize, [this, key](bool success) {
             if (success) {
                 mStorage.remove(key.data(), key.size());
@@ -37,16 +42,21 @@ void MessageQueue::dequeue(const std::function<void(void *ptr, int size, std::fu
         errorHandler(Error(error.store, error.code, error.message));
     }
     );
+    if (!readValue) {
+        errorHandler(Error("messagequeue", -1, "No message found"));
+    }
 }
 
 bool MessageQueue::isEmpty()
 {
     int count = 0;
     mStorage.scan("", [&count](void *keyPtr, int keySize, void *valuePtr, int valueSize) -> bool {
-        const QByteArray key(static_cast<char*>(keyPtr), keySize);
+        const auto key = QByteArray::fromRawData(static_cast<char*>(keyPtr), keySize);
         if (!key.startsWith("__internal")) {
             count++;
+            return false;
         }
+        return true;
     });
     return count == 0;
 }