From 75e6539f81b5b10aac07442cd72995b5afbbd9b1 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Wed, 6 Dec 2017 14:41:05 +0000 Subject: [PATCH] fix streaming test take 2 --- .../src/net/i2p/client/streaming/impl/MessageInputStream.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java index 31875a4f3e..7b7a0a59d8 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java @@ -124,8 +124,6 @@ class MessageInputStream extends InputStream { public boolean canAccept(long messageId, int payloadSize) { if (payloadSize <= 0) return true; - if (messageId < MIN_READY_BUFFERS) - return true; synchronized (_dataLock) { // ready dup check // 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 _notYetReadyBlocks.containsKey(Long.valueOf(messageId)); } + if (messageId < MIN_READY_BUFFERS) + return true; // shortcut test, assuming all ready and not ready blocks are max size, // to avoid iterating through all the ready blocks in getTotalReadySize() if ((_readyDataBlocks.size() + _notYetReadyBlocks.size()) * _maxMessageSize < _maxBufferSize) -- GitLab