Merge pull request #140 from AlenZhou/master

Make SINGLETON thread safe
SBJson · Jul 31, 2012 · 8e0d32c · 8e0d32c
2 parents cbdf88a + 6ee1724
commit 8e0d32c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Classes/SBJsonStreamParserState.m b/Classes/SBJsonStreamParserState.m
@@ -36,7 +36,11 @@
 #define SINGLETON \
 + (id)sharedInstance { \
     static id state = nil; \
-    if (!state) state = [[self alloc] init]; \
+    if (!state) { \
+        @synchronized(self) { \
+            if (!state) state = [[self alloc] init]; \
+        } \
+    } \
     return state; \
 }
 

diff --git a/Classes/SBJsonStreamWriterState.m b/Classes/SBJsonStreamWriterState.m
@@ -35,8 +35,12 @@
 
 #define SINGLETON \
 + (id)sharedInstance { \
-    static id state; \
-    if (!state) state = [[self alloc] init]; \
+    static id state = nil; \
+    if (!state) { \
+        @synchronized(self) { \
+            if (!state) state = [[self alloc] init]; \
+        } \
+    } \
     return state; \
 }