Refactored isEnabled for thread safety

AliSoftware · Mar 9, 2016 · 6b760a5 · 6b760a5
1 parent b0fac31
commit 6b760a5
Showing 1 changed file with 33 additions and 11 deletions.
diff --git a/OHHTTPStubs/Sources/OHHTTPStubs.m b/OHHTTPStubs/Sources/OHHTTPStubs.m
@@ -44,6 +44,7 @@ @interface OHHTTPStubsProtocol : NSURLProtocol @end
 @interface OHHTTPStubs()
 + (instancetype)sharedInstance;
 @property(atomic, copy) NSMutableArray* stubDescriptors;
+@property(atomic, copy) NSNumber* enabledStateNumber;
 @property(atomic, copy, nullable) void (^onStubActivationBlock)(NSURLRequest*, id<OHHTTPStubsDescriptor>);
 @end
 
@@ -105,7 +106,7 @@ + (void)initialize
 {
     if (self == [OHHTTPStubs class])
     {
-        [self setEnabled:YES];
+        [self _setEnable:YES];
     }
 }
 - (instancetype)init
@@ -114,13 +115,14 @@ - (instancetype)init
     if (self)
     {
         _stubDescriptors = [NSMutableArray array];
+        _enabledStateNumber = @YES; // assume initialize has already been run
     }
     return self;
 }
 
 - (void)dealloc
 {
-    [self.class setEnabled:NO];
+    [self.class _setEnable:NO];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -149,25 +151,26 @@ +(void)removeAllStubs
 
 #pragma mark > Disabling & Re-Enabling stubs
 
-static BOOL currentEnabledState = NO;
-
-+(void)setEnabled:(BOOL)enable
++(void)_setEnable:(BOOL)enable
 {
-    currentEnabledState = NO;
-    if (enable && !currentEnabledState)
+    if (enable)
     {
         [NSURLProtocol registerClass:OHHTTPStubsProtocol.class];
     }
-    else if (!enable && currentEnabledState)
+    else
     {
         [NSURLProtocol unregisterClass:OHHTTPStubsProtocol.class];
     }
-    currentEnabledState = enable;
 }
 
-+ (BOOL)isEnabled
++(void)setEnabled:(BOOL)enabled
+{
+    [OHHTTPStubs.sharedInstance setEnabled:enabled];
+}
+
++(BOOL)isEnabled
 {
-    return currentEnabledState;
+    return OHHTTPStubs.sharedInstance.isEnabled;
 }
 
 #if defined(__IPHONE_7_0) || defined(__MAC_10_9)
@@ -240,6 +243,25 @@ +(void)onStubActivation:( nullable void(^)(NSURLRequest* request, id<OHHTTPStubs
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Private instance methods
 
+-(BOOL)isEnabled
+{
+    BOOL enabled = NO;
+    @synchronized(self)
+    {
+        enabled = _enabledStateNumber.boolValue;
+    }
+    return enabled;
+}
+
+-(void)setEnabled:(BOOL)enable
+{
+    @synchronized(self)
+    {
+        _enabledStateNumber = @(enable);
+        [self.class _setEnable:enable];
+    }
+}
+
 -(void)addStub:(OHHTTPStubsDescriptor*)stubDesc
 {
     @synchronized(_stubDescriptors)