Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-03 05:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Orchid deadlock 3

Browse Source 
https://github.com/subgraph/Orchid/pull/10
This commit is contained in:
Devrandom
2014-08-23 14:19:27 -07:00
committed by Mike Hearn
parent 2bc8f952e2
commit 50ad0e7666
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
orchid/src/com/subgraph/orchid/connections/ConnectionImpl.java
View File

@@ -289,29 +289,33 @@ public class ConnectionImpl implements Connection, DashboardRenderable {
} }
private void processRelayCell(Cell cell) { private void processRelayCell(Cell cell) {
Circuit circuit;
circuitsLock.lock(); circuitsLock.lock();
try { try {
final Circuit circuit = circuitMap.get(cell.getCircuitId()); circuit = circuitMap.get(cell.getCircuitId());
if(circuit == null) { if(circuit == null) {
logger.warning("Could not deliver relay cell for circuit id = "+ cell.getCircuitId() +" on connection "+ this +". Circuit not found"); logger.warning("Could not deliver relay cell for circuit id = "+ cell.getCircuitId() +" on connection "+ this +". Circuit not found");
return; return;
} }
circuit.deliverRelayCell(cell);
} finally { } finally {
circuitsLock.unlock(); circuitsLock.unlock();
} }
circuit.deliverRelayCell(cell);
} }
private void processControlCell(Cell cell) { private void processControlCell(Cell cell) {
Circuit circuit;
circuitsLock.lock(); circuitsLock.lock();
try { try {
final Circuit circuit = circuitMap.get(cell.getCircuitId()); circuit = circuitMap.get(cell.getCircuitId());
if(circuit != null) {
circuit.deliverControlCell(cell);
}
} finally { } finally {
circuitsLock.unlock(); circuitsLock.unlock();
} }
if(circuit != null) {
circuit.deliverControlCell(cell);
}
} }
void idleCloseCheck() { void idleCloseCheck() {