diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-10-25 11:41:22 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-10-25 11:41:22 -0700 |
| commit | 344620e9530dfc359b181c5481b88942448006a8 (patch) | |
| tree | adc09a1bfef5a0a8d0338820ab19cfde57f2bca3 /src/net.cpp | |
| parent | e74d0ab6752407d97c0586b1ba9bbaaad5e2e5f6 (diff) | |
| parent | 529a4d4824136a00e63cd69831023b9c4dd6936b (diff) | |
| download | bitcoin-344620e9530dfc359b181c5481b88942448006a8.tar.xz | |
Merge pull request #1904 from laanwj/2012_10_remove_getorder
remove "checkorder" P2P command
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/net.cpp b/src/net.cpp index 2598f0214e..272e6ff0b4 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -710,13 +710,9 @@ void ThreadSocketHandler2(void* parg) TRY_LOCK(pnode->cs_vRecv, lockRecv); if (lockRecv) { - TRY_LOCK(pnode->cs_mapRequests, lockReq); - if (lockReq) - { - TRY_LOCK(pnode->cs_inventory, lockInv); - if (lockInv) - fDelete = true; - } + TRY_LOCK(pnode->cs_inventory, lockInv); + if (lockInv) + fDelete = true; } } } |