AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toclet #984 : fix deadlock introduced in -4 (ticket #972)

Browse Source
This commit is contained in:
zab2
2013-07-21 14:54:36 +00:00
parent 1b42d99e66
commit 2313d82369
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 5;
public final static long BUILD = 6;
/** for example "-test" */
public final static String EXTRA = "";

4
router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
View File

@@ -83,7 +83,7 @@ class NTCPConnection {
private final Set<FIFOBandwidthLimiter.Request> _bwInRequests;
private final Set<FIFOBandwidthLimiter.Request> _bwOutRequests;
private long _establishedOn;
private EstablishState _establishState;
private volatile EstablishState _establishState;
private final NTCPTransport _transport;
private final boolean _isInbound;
private volatile boolean _closed;
@@ -232,7 +232,7 @@ class NTCPConnection {
public void setChannel(SocketChannel chan) { _chan = chan; }
public void setKey(SelectionKey key) { _conKey = key; }
public boolean isInbound() { return _isInbound; }
public synchronized boolean isEstablished() { return _establishState.isComplete(); }
public boolean isEstablished() { return _establishState.isComplete(); }
/**
* @since IPv6