Merge pull request #657 from couchbase/feature/issue_649_mapped_file

Remove NSDataReadingMappedIfSafe when reading attachment content
couchbase · Apr 14, 2015 · 4cf8324 · 4cf8324
2 parents 02eb6f6 + c073243
commit 4cf8324
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Source/API/CBLAttachment.m b/Source/API/CBLAttachment.m
@@ -118,7 +118,7 @@ - (NSData*) content {
             return _body;
         else if ([_body isKindOfClass: [NSURL class]] && [_body isFileURL]) {
             return [NSData dataWithContentsOfURL: _body
-                                         options: NSDataReadingMappedIfSafe | NSDataReadingUncached
+                                         options: NSDataReadingUncached
                                            error: nil];
         }
         return nil;

diff --git a/Source/CBL_BlobStore.m b/Source/CBL_BlobStore.m
@@ -120,8 +120,7 @@ - (BOOL) hasBlobForKey: (CBLBlobKey)key {
 
 - (NSData*) blobForKey: (CBLBlobKey)key {
     NSString* path = [self rawPathForKey: key];
-    NSData* blob =  [NSData dataWithContentsOfFile: path options: NSDataReadingMappedIfSafe
-                                             error: NULL];
+    NSData* blob = [NSData dataWithContentsOfFile: path options: NSDataReadingUncached error: NULL];
     if (_encryptionKey && blob) {
         blob = [_encryptionKey decryptData: blob];
         CBLBlobKey decodedKey = [[self class] keyForBlob: blob];