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

i2ptunnel: Close input stream when HTTP client decompressor terminates (ticket #1506)

Browse Source 
streaming: Minor cleanups, log tweaks
This commit is contained in:
zzz
2015-05-04 14:43:54 +00:00
parent 2226936737
commit f7b7a98b9d
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ class I2PSocketFull implements I2PSocket {
Connection c = _connection;
if (c == null) return;
if (log.shouldLog(Log.INFO))
log.info("close() called, connected? " + c.getIsConnected() + " : " + c);
log.info("close() called, connected? " + c.getIsConnected() + " : " + c, new Exception());
if (c.getIsConnected()) {
MessageInputStream in = c.getInputStream();
in.close();

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

@@ -61,6 +61,9 @@ class MessageInputStream extends InputStream {
private final int _maxBufferSize;
private final byte[] _oneByte = new byte[1];
private final Object _dataLock;
/** only in _notYetReadyBlocks, never in _readyDataBlocks */
private static final ByteArray DUMMY_BA = new ByteArray(null);
private static final int MIN_READY_BUFFERS = 16;
@@ -320,9 +323,9 @@ class MessageInputStream extends InputStream {
_highestReadyBlockId = messageId;
long cur = _highestReadyBlockId + 1;
// now pull in any previously pending blocks
while (_notYetReadyBlocks.containsKey(Long.valueOf(cur))) {
ByteArray ba = _notYetReadyBlocks.remove(Long.valueOf(cur));
if ( (ba != null) && (ba.getData() != null) && (ba.getValid() > 0) ) {
ByteArray ba;
while ((ba = _notYetReadyBlocks.remove(Long.valueOf(cur))) != null) {
if (ba.getData() != null && ba.getValid() > 0) {
_readyDataBlocks.add(ba);
}
@@ -336,13 +339,17 @@ class MessageInputStream extends InputStream {
// Java throws a SocketTimeoutException.
// We do neither.
} else {
if (_log.shouldLog(Log.INFO))
_log.info("Message is out of order: " + messageId);
// _notYetReadyBlocks size is limited in ConnectionPacketHandler.
if (_locallyClosed) // dont need the payload, just the msgId in order
_notYetReadyBlocks.put(Long.valueOf(messageId), new ByteArray(null));
else
// _notYetReadyBlocks size is limited in canAccept()
if (_locallyClosed) {
if (_log.shouldInfo())
_log.info("Message received on closed stream: " + messageId);
// dont need the payload, just the msgId in order
_notYetReadyBlocks.put(Long.valueOf(messageId), DUMMY_BA);
} else {
if (_log.shouldInfo())
_log.info("Message is out of order: " + messageId);
_notYetReadyBlocks.put(Long.valueOf(messageId), payload);
}
}
_dataLock.notifyAll();
}