Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 15:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Orchid: document an issue with pending circuits on shutdown

Browse Source
This commit is contained in:
Devrandom 2014-08-24 14:41:13 -07:00 committed by Mike Hearn
parent f57c3a857c
commit b6eb96cb44
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
orchid/src/com/subgraph/orchid/circuits/CircuitManagerImpl.java
View File

@ -129,20 +129,21 @@ public class CircuitManagerImpl implements CircuitManager, DashboardRenderable {
}
void addActiveCircuit(CircuitImpl circuit) {
synchronized (activeCircuits) {
activeCircuits.add(circuit);
activeCircuits.notifyAll();
}
lock.lock();
try {
if (!isBuilding) {
// we were asked to stop since this circuit was started
circuit.destroyCircuit();
}
} finally {
lock.unlock();
}
synchronized (activeCircuits) {
activeCircuits.add(circuit);
activeCircuits.notifyAll();
}
}
void removeActiveCircuit(CircuitImpl circuit) {

3
orchid/src/com/subgraph/orchid/connections/ConnectionCacheImpl.java
View File

@ -94,6 +94,9 @@ public class ConnectionCacheImpl implements ConnectionCache, DashboardRenderable
logger.warning("Exception closing connection: "+ e.getCause());
}
} else {
// FIXME this doesn't close the socket, so the connection task lingers
// A proper fix would require maintaining pending connections in a separate
// collection.
f.cancel(true);
}
}