Merge branch 'staging' of ssh://github.com/BranchMetrics/ios-branch-deep-linking into QA

Author: Edward Smith

Branch-SDK/Branch-SDK/BranchContentDiscoveryManifest.m

@@ -6,23 +6,21 @@
 //  Copyright © 2016 Branch Metrics. All rights reserved.
 //
 
+
 #import <Foundation/Foundation.h>
 #import "BranchContentDiscoveryManifest.h"
 #import "BNCPreferenceHelper.h"
 #import "BranchContentPathProperties.h"
 #import <UIKit/UIKit.h>
 #import "BranchConstants.h"
 
-@interface BranchContentDiscoveryManifest ()
 
+@interface BranchContentDiscoveryManifest ()
 @property (nonatomic, strong) NSString *manifestVersion;
-
 @end
 
-@implementation BranchContentDiscoveryManifest
-
 
-static BranchContentDiscoveryManifest *contentDiscoveryManifest;
+@implementation BranchContentDiscoveryManifest
 
 - (instancetype)init {
     self = [super init];
@@ -38,14 +36,15 @@ - (instancetype)init {
 }
 
 + (BranchContentDiscoveryManifest *)getInstance {
-    if (!contentDiscoveryManifest) {
-        contentDiscoveryManifest = [[BranchContentDiscoveryManifest alloc] init];
+    @synchronized (self) {
+        static BranchContentDiscoveryManifest *contentDiscoveryManifest = nil;
+        if (!contentDiscoveryManifest) {
+            contentDiscoveryManifest = [[BranchContentDiscoveryManifest alloc] init];
+        }
+        return contentDiscoveryManifest;
     }
-    return contentDiscoveryManifest;
 }
 
-
-
 - (void)onBranchInitialised:(NSDictionary *)branchInitDict withUrl:(NSString *)referredUrl {
     _referredLink = referredUrl;
     if ([branchInitDict objectForKey:BRANCH_CONTENT_DISCOVER_KEY]) {