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

fix streaming test take 2

Browse Source
This commit is contained in:
zzz
2017-12-06 14:41:05 +00:00
parent 956c9607ff
commit 75e6539f81
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,8 +124,6 @@ class MessageInputStream extends InputStream {
public boolean canAccept(long messageId, int payloadSize) { public boolean canAccept(long messageId, int payloadSize) {
if (payloadSize <= 0) if (payloadSize <= 0)
return true; return true;
if (messageId < MIN_READY_BUFFERS)
return true;
synchronized (_dataLock) { synchronized (_dataLock) {
// ready dup check // ready dup check
// we always allow sequence numbers less than or equal to highest received // we always allow sequence numbers less than or equal to highest received
@ -136,6 +134,8 @@ class MessageInputStream extends InputStream {
// return true if a not-ready dup, false if not // return true if a not-ready dup, false if not
return _notYetReadyBlocks.containsKey(Long.valueOf(messageId)); return _notYetReadyBlocks.containsKey(Long.valueOf(messageId));
} }
if (messageId < MIN_READY_BUFFERS)
return true;
// shortcut test, assuming all ready and not ready blocks are max size, // shortcut test, assuming all ready and not ready blocks are max size,
// to avoid iterating through all the ready blocks in getTotalReadySize() // to avoid iterating through all the ready blocks in getTotalReadySize()
if ((_readyDataBlocks.size() + _notYetReadyBlocks.size()) * _maxMessageSize < _maxBufferSize) if ((_readyDataBlocks.size() + _notYetReadyBlocks.size()) * _maxMessageSize < _maxBufferSize)