[FAB-11135] minor fix in pkcs11 object handle

Change-Id: I111630cb415350ea2dfc04b972f45c2a2fe50a27 Signed-off-by: Sudesh Shetty <sudesh.shetty@securekey.com>
hyperledger · Jul 13, 2018 · 78f2bba · 78f2bba
1 parent fce3f3b
commit 78f2bba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/github.com/hyperledger/fabric/sdkpatch/cachebridge/cache.go b/internal/github.com/hyperledger/fabric/sdkpatch/cachebridge/cache.go
@@ -85,10 +85,10 @@ func AddSession(rwMtx sync.RWMutex, key string) {
 	rwMtx.RUnlock()
 
 	if !ok {
+		rwMtx.Lock()
 		if sessionCache == nil {
 			sessionCache = make(map[string]*lazycache.Cache)
 		}
-		rwMtx.Lock()
 		sessionCache[key] = lazycache.New(
 			"KeyPair_Resolver_Cache",
 			func(key lazycache.Key) (interface{}, error) {

diff --git a/scripts/third_party_pins/fabric/patches/0004-sessioncache.patch b/scripts/third_party_pins/fabric/patches/0004-sessioncache.patch
@@ -99,10 +99,10 @@ index 0000000..4772d51
 +	rwMtx.RUnlock()
 +
 +	if !ok {
++		rwMtx.Lock()
 +		if sessionCache == nil {
 +			sessionCache = make(map[string]*lazycache.Cache)
 +		}
-+		rwMtx.Lock()
 +		sessionCache[key] = lazycache.New(
 +			"KeyPair_Resolver_Cache",
 +			func(key lazycache.Key) (interface{}, error) {