Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-12 10:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Orchid: fix infinite task creation loop when shutting down

Browse Source
This commit is contained in:
Devrandom 2014-08-24 12:49:34 -07:00 committed by Mike Hearn
parent 5be769d4ca
commit de3665f734
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orchid/src/com/subgraph/orchid/ConnectionCache.java
View File

@ -18,4 +18,6 @@ public interface ConnectionCache {
Connection getConnectionTo(Router router, boolean isDirectoryConnection) throws InterruptedException, ConnectionTimeoutException, ConnectionFailedException, ConnectionHandshakeException; Connection getConnectionTo(Router router, boolean isDirectoryConnection) throws InterruptedException, ConnectionTimeoutException, ConnectionFailedException, ConnectionHandshakeException;
void close(); void close();
boolean isClosed();
} }

5
orchid/src/com/subgraph/orchid/circuits/CircuitCreationTask.java
View File

@ -142,6 +142,11 @@ public class CircuitCreationTask implements Runnable {
} }
private void buildCircuitIfNeeded() { private void buildCircuitIfNeeded() {
if (connectionCache.isClosed()) {
logger.warning("Not building circuits, because connection cache is closed");
return;
}
final List<StreamExitRequest> pendingExitStreams = circuitManager.getPendingExitStreams(); final List<StreamExitRequest> pendingExitStreams = circuitManager.getPendingExitStreams();
final List<PredictedPortTarget> predictedPorts = predictor.getPredictedPortTargets(); final List<PredictedPortTarget> predictedPorts = predictor.getPredictedPortTargets();
final List<ExitTarget> exitTargets = new ArrayList<ExitTarget>(); final List<ExitTarget> exitTargets = new ArrayList<ExitTarget>();

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

@ -101,6 +101,11 @@ public class ConnectionCacheImpl implements ConnectionCache, DashboardRenderable
scheduledExecutor.shutdownNow(); scheduledExecutor.shutdownNow();
} }
@Override
public boolean isClosed() {
return isClosed;
}
public Connection getConnectionTo(Router router, boolean isDirectoryConnection) throws InterruptedException, ConnectionTimeoutException, ConnectionFailedException, ConnectionHandshakeException { public Connection getConnectionTo(Router router, boolean isDirectoryConnection) throws InterruptedException, ConnectionTimeoutException, ConnectionFailedException, ConnectionHandshakeException {
if(isClosed) { if(isClosed) {
throw new IllegalStateException("ConnectionCache has been closed"); throw new IllegalStateException("ConnectionCache has been closed");