Merge branch 'master' of https://github.com/yapstudios/YapDatabase

Author: robbiehanson

YapDatabase/Extensions/SecondaryIndex/YapDatabaseSecondaryIndexTransaction.m

@@ -889,7 +889,7 @@ - (void)handleReplaceObject:(id)object forCollectionKey:(YapCollectionKey *)coll
 			__unsafe_unretained YapDatabaseSecondaryIndexWithRowBlock block =
 			  (YapDatabaseSecondaryIndexWithRowBlock)secondaryIndex->block;
 
-			metadata = [databaseTransaction objectForCollectionKey:collectionKey withRowid:rowid];
+			metadata = [databaseTransaction metadataForCollectionKey:collectionKey withRowid:rowid];
 			block(secondaryIndexConnection->blockDict, collection, key, object, metadata);
 		}
 

YapDatabase/YapDatabase.m

@@ -115,7 +115,7 @@ + (YapDatabaseSerializer)defaultSerializer
 + (YapDatabaseDeserializer)defaultDeserializer
 {
 	return ^ id (NSString __unused *collection, NSString __unused *key, NSData *data){
-		return [NSKeyedUnarchiver unarchiveObjectWithData:data];
+		return data && data.length > 0 ? [NSKeyedUnarchiver unarchiveObjectWithData:data] : nil;
 	};
 }