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

streaming minor tweaks

Browse Source
This commit is contained in:
zzz
2018-08-23 15:20:29 +00:00
parent fddaa47ded
commit e243e0ddba
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
View File

@@ -64,8 +64,8 @@ class ConnectionHandler {
public synchronized void setActive(boolean active) {
// FIXME active=false this only kills for one thread in accept()
// if there are more, they won't get a poison packet.
if (_log.shouldLog(Log.WARN))
_log.warn("setActive(" + active + ") called, previously " + _active, new Exception("I did it"));
if (_log.shouldInfo())
_log.info("setActive(" + active + ") called, previously " + _active, new Exception("I did it"));
// if starting, clear any old poison
if (active && !_active) {
_restartPending = false;

3
apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketOptionsImpl.java
View File

@@ -17,6 +17,7 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
private int _remotePort;
public static final int DEFAULT_BUFFER_SIZE = 1024*64;
public static final int DEFAULT_READ_TIMEOUT = -1;
public static final int DEFAULT_WRITE_TIMEOUT = -1;
public static final int DEFAULT_CONNECT_TIMEOUT = 60*1000;
@@ -71,7 +72,7 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
if (opts.getProperty(PROP_CONNECT_TIMEOUT) != null)
_connectTimeout = getInt(opts, PROP_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT);
if (opts.getProperty(PROP_READ_TIMEOUT) != null)
_readTimeout = getInt(opts, PROP_READ_TIMEOUT, -1);
_readTimeout = getInt(opts, PROP_READ_TIMEOUT, DEFAULT_READ_TIMEOUT);
if (opts.getProperty(PROP_WRITE_TIMEOUT) != null)
_writeTimeout = getInt(opts, PROP_WRITE_TIMEOUT, DEFAULT_WRITE_TIMEOUT);
}

2
apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java
View File

@@ -74,7 +74,7 @@ class MessageInputStream extends InputStream {
_readyDataBlocks = new ArrayList<ByteArray>(4);
_highestReadyBlockId = -1;
_highestBlockId = -1;
_readTimeout = -1;
_readTimeout = I2PSocketOptionsImpl.DEFAULT_READ_TIMEOUT;
_notYetReadyBlocks = new HashMap<Long, ByteArray>(4);
_dataLock = new Object();
_maxMessageSize = maxMessageSize;