diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java index c001d2d4e7..151ce2399a 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java @@ -1458,7 +1458,8 @@ class Connection { public synchronized void pushBackRTO(int rto) { if (!_scheduled) { - _log.log(Log.ERROR, Connection.this + " timer was not scheduled", new Exception()); + if (_log.shouldWarn()) + _log.warn(Connection.this + " timer was not scheduled", new Exception()); } reschedule(rto, false); } diff --git a/history.txt b/history.txt index c6e4f6a281..c073022edc 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2020-05-14 zzz + * Streaming: Change pushBackRTO() log error to warn (ticket #2739) + 2020-05-13 zzz * Console: - Fix option text on /confignet (ticket #2738) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f5c9264549..601535dbe6 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 20; + public final static long BUILD = 21; /** for example "-test" */ - public final static String EXTRA = ""; + public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION);