summaryrefslogtreecommitdiffstats
path: root/common/pipeline.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2015-01-19 19:26:14 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2015-01-19 19:26:14 +0100
commitdd6196206f87086a636677da55cf5c300a8e932a (patch)
tree246be20e4ff5568df01dfdc7411a0267f1f1b028 /common/pipeline.cpp
parent65e5a6ac8848750e94e35ec65ac37d0d4a8638cd (diff)
downloadsink-dd6196206f87086a636677da55cf5c300a8e932a.tar.gz
sink-dd6196206f87086a636677da55cf5c300a8e932a.zip
Fixed sync, detect errors during sync, wait until sync items are processed until signalling completion.
Diffstat (limited to 'common/pipeline.cpp')
-rw-r--r--common/pipeline.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 8f15fef..13a3344 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -107,7 +107,7 @@ Async::Job<void> Pipeline::newEntity(void const *command, size_t size)
107 flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(command), size); 107 flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(command), size);
108 if (!Akonadi2::Commands::VerifyCreateEntityBuffer(verifyer)) { 108 if (!Akonadi2::Commands::VerifyCreateEntityBuffer(verifyer)) {
109 qWarning() << "invalid buffer, not a create entity buffer"; 109 qWarning() << "invalid buffer, not a create entity buffer";
110 return Async::null<void>(); 110 return Async::error<void>();
111 } 111 }
112 } 112 }
113 auto createEntity = Akonadi2::Commands::GetCreateEntity(command); 113 auto createEntity = Akonadi2::Commands::GetCreateEntity(command);
@@ -118,7 +118,7 @@ Async::Job<void> Pipeline::newEntity(void const *command, size_t size)
118 flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(createEntity->delta()->Data()), createEntity->delta()->size()); 118 flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(createEntity->delta()->Data()), createEntity->delta()->size());
119 if (!Akonadi2::VerifyEntityBuffer(verifyer)) { 119 if (!Akonadi2::VerifyEntityBuffer(verifyer)) {
120 qWarning() << "invalid buffer, not an entity buffer"; 120 qWarning() << "invalid buffer, not an entity buffer";
121 return Async::null<void>(); 121 return Async::error<void>();
122 } 122 }
123 } 123 }
124 auto entity = Akonadi2::GetEntity(createEntity->delta()->Data()); 124 auto entity = Akonadi2::GetEntity(createEntity->delta()->Data());