Fix multithreading issue caused by wrong copy-paste

xiaofei86 · xiaofei86 · commit a1ce164273c4 · 2022-02-18T16:19:20.000+08:00
diff --git a/CarbonCore.podspec b/CarbonCore.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = 'CarbonCore'
-  spec.version      = '1.3.0'
+  spec.version      = '1.3.1'
   spec.license      = { :type => 'MIT', :file => 'LICENSE' }
   spec.summary      = 'Swift dependency injection framework for iOS'
   spec.homepage     = 'https://github.com/baidu/CarbonGraph'
diff --git a/CarbonCore/CarbonCore/CarbonCore.docc/Compatibility.md b/CarbonCore/CarbonCore/CarbonCore.docc/Compatibility.md
@@ -8,14 +8,14 @@ The Requirements and Compatibility
 
 | CarbonCore Stable Version | Required iOS Version | Required Swift Version |
 | --- | --- | --- |
-| 1.2.2 - 1.3.0 | 9.0 | 5.2 |
+| 1.2.2, 1.3.1 | 9.0 | 5.2 |
 
 ### CarbonObjC Version Compatibility
 
 | CarbonObjC Version | CarbonCore Compatible Version |
 | --- | --- |
 | 1.2.2 | 1.2.2 |
-| 1.3.0 | 1.3.0 |
+| 1.3.1 | 1.3.1 |
 
 ### Build for distribution
 
diff --git a/CarbonCore/CarbonCore/ObjectResolver.swift b/CarbonCore/CarbonCore/ObjectResolver.swift
@@ -45,7 +45,7 @@ public class ObjectResolver: NSObject {
         }
         
         // Object created by other thread
-        if let safeObject = (def.lock.read { def.storage.object }),
+        if let safeObject = def.storage.object,
            let otherObject = safeObject as? T {
             return otherObject
         }
@@ -126,7 +126,7 @@ public class ObjectResolver: NSObject {
         }
         
         // Object created by factory or constructor
-        if let safeObject = (def.lock.read { def.storage.object }),
+        if let safeObject = def.storage.object,
            let otherObject = safeObject as? T {
             return otherObject
         }
diff --git a/CarbonObjC.podspec b/CarbonObjC.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name     = 'CarbonObjC'
-  spec.version  = '1.3.0'
+  spec.version  = '1.3.1'
   spec.license  = { :type => 'MIT', :file => 'LICENSE' }
   spec.homepage = 'https://github.com/baidu/CarbonGraph'
   spec.authors  = { 'Baidu' => 'carbon-core@baidu.com' }
diff --git a/README.md b/README.md
@@ -34,14 +34,14 @@ The CarbonGraph project contains 2 frameworks:
 
 | CarbonCore Stable Version | Required iOS Version | Required Swift Version |
 | --- | --- | --- |
-| 1.2.2 - 1.3.0 | 9.0 | 5.2 |
+| 1.2.2, 1.3.1 | 9.0 | 5.2 |
 
 * CarbonObjC Version Compatibility
 
 | CarbonObjC Version | CarbonCore Compatible Version |
 | --- | --- |
 | 1.2.2 | 1.2.2 |
-| 1.3.0 | 1.3.0 |
+| 1.3.1 | 1.3.1 |
 
 For more information see [Compatibility](./CarbonCore/CarbonCore/CarbonCore.docc/Compatibility.md)
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public class ObjectResolver: NSObject {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Object created by other thread`
`48`		`- if let safeObject = (def.lock.read { def.storage.object }),`
	`48`	`+ if let safeObject = def.storage.object,`
`49`	`49`	`let otherObject = safeObject as? T {`
`50`	`50`	`return otherObject`
`51`	`51`	`}`
`@@ -126,7 +126,7 @@ public class ObjectResolver: NSObject {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// Object created by factory or constructor`
`129`		`- if let safeObject = (def.lock.read { def.storage.object }),`
	`129`	`+ if let safeObject = def.storage.object,`
`130`	`130`	`let otherObject = safeObject as? T {`
`131`	`131`	`return otherObject`
`132`	`132`	`}`