CBL-619: Backport shared keys fix to cobalt

couchbase · Jan 22, 2020 · 82620b7 · 82620b7
1 parent 3d38ee8
commit 82620b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/LiteCore/Storage/DataFile.cc b/LiteCore/Storage/DataFile.cc
@@ -297,6 +297,7 @@ namespace litecore {
         if (!keys && _options.useDocumentKeys) {
             auto mutableThis = const_cast<DataFile*>(this);
             keys = new DocumentKeys(*mutableThis);
+            keys->refresh();
             mutableThis->_documentKeys = keys;
         }
         return keys;

diff --git a/Replicator/DBAccess.cc b/Replicator/DBAccess.cc
@@ -311,7 +311,7 @@ namespace litecore { namespace repl {
         Doc reEncodedDoc;
         if (useLegacyAttachments || !useDBSharedKeys) {
             Encoder enc;
-            enc.setSharedKeys(_tempSharedKeys);
+            enc.setSharedKeys(tempSharedKeys());
             if (useLegacyAttachments) {
                 // Delta refers to legacy attachments, so convert my base revision to have them:
                 encodeRevWithLegacyAttachments(enc, srcRoot, 1);

diff --git a/vendor/fleece b/vendor/fleece