2 files changed, 26 insertions, 10 deletions

diff --git a/dummyresource/domainadaptor.cpp b/dummyresource/domainadaptor.cpp
index d902052..2182f9a 100644
--- a/dummyresource/domainadaptor.cpp
+++ b/dummyresource/domainadaptor.cpp
@@ -100,13 +100,13 @@ QSharedPointer<Akonadi2::Domain::BufferAdaptor> DummyEventAdaptorFactory::create
         }
     }
 
-    Akonadi2::Metadata const *metadataBuffer = 0;
-    if (auto metadataData = entity.metadata()) {
-        flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
-        if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
-            metadataBuffer = Akonadi2::GetMetadata(metadataData->Data());
-        }
-    }
+    // Akonadi2::Metadata const *metadataBuffer = 0;
+    // if (auto metadataData = entity.metadata()) {
+    //     flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
+    //     if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
+    //         metadataBuffer = Akonadi2::GetMetadata(metadataData->Data());
+    //     }
+    // }
 
     Akonadi2::Domain::Buffer::Event const *localBuffer = 0;
     if (auto localData = entity.local()) {
diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp
index 10c8eaf..6e06250 100644
--- a/dummyresource/resourcefactory.cpp
+++ b/dummyresource/resourcefactory.cpp
@@ -122,6 +122,17 @@ public:
 signals:
     void error(int errorCode, const QString &errorMessage);
 
+private:
+    bool messagesToProcessAvailable()
+    {
+        for (auto queue : mCommandQueues) {
+            if (!queue->isEmpty()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 private slots:
     void process()
     {
@@ -131,11 +142,15 @@ private slots:
         mProcessingLock = true;
         auto job = processPipeline().then<void>([this]() {
             mProcessingLock = false;
+            if (messagesToProcessAvailable()) {
+                process();
+            }
         }).exec();
     }
 
     Async::Job<void> processQueuedCommand(const Akonadi2::QueuedCommand *queuedCommand)
     {
+        Log() << "Processing command: " << queuedCommand->commandId();
         //Throw command into appropriate pipeline
         switch (queuedCommand->commandId()) {
             case Akonadi2::Commands::DeleteEntityCommand:
@@ -170,7 +185,7 @@ private slots:
 
                         flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(ptr), size);
                         if (!Akonadi2::VerifyQueuedCommandBuffer(verifyer)) {
-                            qWarning() << "invalid buffer";
+                            Warning() << "invalid buffer";
                             callback(false);
                             return;
                         }
@@ -185,13 +200,13 @@ private slots:
                                 callback(true);
                             },
                             [callback](int errorCode, QString errorMessage) {
-                                Warning() << errorMessage;
+                                Warning() << "Error while processing queue command: " << errorMessage;
                                 callback(false);
                             }
                         ).exec();
                     },
                     [&future](const MessageQueue::Error &error) {
-                        Warning() << error.message;
+                        Warning() << "Error while getting message from messagequeue: " << error.message;
                         future.setValue(false);
                         future.setFinished();
                     }
@@ -209,6 +224,7 @@ private slots:
             [it, this](Async::Future<void> &future) {
                 auto queue = it->next();
                 processQueue(queue).then<void>([&future]() {
+                    Trace() << "Queue processed";
                     future.setFinished();
                 }).exec();
             }