Merge pull request microsoft#506 from daniel-beard/dbeard_add_class_g…

…uard_in_initialize_method Check against self class in initialize methods
lisong · Sep 1, 2016 · 5ebfdf7 · 5ebfdf7
2 parents 77679d8 + eeddfda
commit 5ebfdf7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ios/CodePush/CodePush.m b/ios/CodePush/CodePush.m
@@ -61,8 +61,10 @@ @implementation CodePush {
 
 + (void)initialize
 {
-    // Use the mainBundle by default.
-    bundleResourceBundle = [NSBundle mainBundle];
+    if (self == [CodePush class]) {
+        // Use the mainBundle by default.
+        bundleResourceBundle = [NSBundle mainBundle];
+    }
 }
 
 #pragma mark - Public Obj-C API

diff --git a/ios/CodePush/CodePushConfig.m b/ios/CodePush/CodePushConfig.m
@@ -20,7 +20,9 @@ + (instancetype)current
 
 + (void)initialize
 {
-    _currentConfig = [[CodePushConfig alloc] init];
+    if (self == [CodePushConfig class]) {
+        _currentConfig = [[CodePushConfig alloc] init];
+    }
 }
 
 - (instancetype)init