Fix CouchDB transaction manager lock issue

The committer read/write lock was at wrong level, causing a lock that never got unlocked during end-to-end trials. Change-Id: I49b31207844b97f7e6f7e375450728a7ca71e7dd Signed-off-by: denyeart <enyeart@us.ibm.com>
hyperledger · Nov 7, 2016 · b53666d · b53666d
1 parent 6ac4ed5
commit b53666d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/ledger/kvledger/txmgmt/couchdbtxmgmt/couchdb_txmgr.go b/core/ledger/kvledger/txmgmt/couchdbtxmgmt/couchdb_txmgr.go
@@ -264,11 +264,11 @@ func (txmgr *CouchDBTxMgr) Commit() error {
 		panic("validateAndPrepare() method should have been called before calling commit()")
 	}
 
-	for k, v := range txmgr.updateSet.m {
+	txmgr.commitRWLock.Lock()
+	defer txmgr.commitRWLock.Unlock()
+	defer func() { txmgr.updateSet = nil }()
 
-		txmgr.commitRWLock.Lock()
-		defer txmgr.commitRWLock.Unlock()
-		defer func() { txmgr.updateSet = nil }()
+	for k, v := range txmgr.updateSet.m {
 
 		if couchdb.IsJSON(string(v.value)) {