ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source 
Conflicts:
	src/FieldNames.cpp

This is guaranteed safe. Shortly, I'll change it to call a constructor
that doesn't acquire the mutex.
This commit is contained in:
JoelKatz
2012-10-05 13:07:09 -07:00
parent a9c1b51e82 b304d9ae43
commit 830971b606
5 changed files with 95 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/FieldNames.cpp
View File

@@ -34,6 +34,8 @@ SField::ref SField::getField(int code)
if ((type <= 0) || (field <= 0))
return sfInvalid;
boost::mutex::scoped_lock sl(mapMutex);
boost::recursive_mutex::scoped_lock sl(mapMutex);
std::map<int, SField::ptr>::iterator it = codeToField.find(code);