FAB-18301 Registrar.JoinChannel takes the wrong lock type (#2058)

Replace RLock() with Lock() since Registrar.JoinChannel writes to the internal data structure. Signed-off-by: Yoav Tock <[email protected]> Change-Id: Ic78a35ad6167e4ccbb3d1613ce1085bfdcb5aba1
hyperledger · Oct 29, 2020 · 067f09b · 067f09b
1 parent e4c54fa
commit 067f09b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/orderer/common/multichannel/registrar.go b/orderer/common/multichannel/registrar.go
@@ -693,8 +693,8 @@ func (r *Registrar) ChannelInfo(channelID string) (types.ChannelInfo, error) {
 // JoinChannel instructs the orderer to create a channel and join it with the provided config block.
 // The URL field is empty, and is to be completed by the caller.
 func (r *Registrar) JoinChannel(channelID string, configBlock *cb.Block, isAppChannel bool) (info types.ChannelInfo, err error) {
-	r.lock.RLock()
-	defer r.lock.RUnlock()
+	r.lock.Lock()
+	defer r.lock.Unlock()
 
 	if r.systemChannelID != "" {
 		return types.ChannelInfo{}, types.ErrSystemChannelExists