diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java index 5383873e9..edf7963fc 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java @@ -27,7 +27,6 @@ class ConnThrottler { ConnThrottler(int max, int totalMax, long period) { _max = max; _totalMax = totalMax; - SimpleScheduler.getInstance().addPeriodicEvent(new Cleaner(), period); if (max > 0) this.counter = new ObjectCounter(); else @@ -36,6 +35,7 @@ class ConnThrottler { _currentTotal = new AtomicInteger(); else _currentTotal = null; + SimpleScheduler.getInstance().addPeriodicEvent(new Cleaner(), period); } /** increments before checking */ diff --git a/build.xml b/build.xml index 9cb1ba223..615608737 100644 --- a/build.xml +++ b/build.xml @@ -722,7 +722,7 @@ - + diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 58c162857..00495669c 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -16,7 +16,7 @@ package net.i2p; public class CoreVersion { /** deprecated */ public final static String ID = "Monotone"; - public final static String VERSION = "0.7.13"; + public final static String VERSION = "0.7.14"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/core/java/src/net/i2p/util/Translate.java b/core/java/src/net/i2p/util/Translate.java index 40d07f76c..11fc9d45e 100644 --- a/core/java/src/net/i2p/util/Translate.java +++ b/core/java/src/net/i2p/util/Translate.java @@ -110,7 +110,7 @@ public abstract class Translate { * * @param n how many * @param s singluar string, optionally with {0} e.g. "one tunnel" - * @param s plural string optionally with {0} e.g. "{0} tunnels" + * @param p plural string optionally with {0} e.g. "{0} tunnels" * @since 0.7.14 */ public static String getString(int n, String s, String p, I2PAppContext ctx, String bun) { diff --git a/history.txt b/history.txt index bca327011..7a36876bd 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +* 2010-06-07 0.7.14 released + +2010-06-07 zzz + * Misc tweaks after code review + 2010-06-05 zzz * Netdb: - Use new receivedAsReply flag in LeaseSet to mark diff --git a/installer/install.xml b/installer/install.xml index 37fe5fce1..248e594b8 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.7.13 + 0.7.14 diff --git a/installer/resources/initialNews.xml b/installer/resources/initialNews.xml index 907d9f724..1ad5b28ad 100644 --- a/installer/resources/initialNews.xml +++ b/installer/resources/initialNews.xml @@ -1,6 +1,6 @@

  • Congratulations on getting I2P installed!

diff --git a/installer/resources/news.xml b/installer/resources/news.xml index 733875f2e..20001e842 100644 --- a/installer/resources/news.xml +++ b/installer/resources/news.xml @@ -1,17 +1,20 @@ -

+

-The 0.7.13 release contains several changes and bug fixes to improve performance. -It also includes improvements for the plugin support that was -introduced in the last release. -The new, smaller tunnel build message is enabled, -to reduce overhead and increase build success. -

-Of course, there is the usual assortment of bug fixes as well. +The 0.7.14 release contains the usual collection of bug fixes and performance tweaks. +There are also some i2psnark improvements and more fixes for plugins. Upgrading is recommended. +

+Important note: Due to a bug in 0.7.13 and earlier releases, clicking 'Download 0.7.14 Update' +in your router console summary bar, when you have the summary bar refresh enabled, +may result in multiple downloads of the update. Please disable the summary bar refresh +before clicking the download button. +If your update policy is set to 'Download and Verify Only' (the default) then +you should not have a problem, the router will download the file once. +

Please help grow the network! Say hello to the volunteers on the new #i2p-help IRC channel. Give the diff --git a/installer/resources/themes/console/light/default.css b/installer/resources/themes/console/light/default.css index f8a27deed..ab0e677bb 100644 --- a/installer/resources/themes/console/light/default.css +++ b/installer/resources/themes/console/light/default.css @@ -47,7 +47,6 @@ h4 { padding: 5px 10px; background: #b4c8ff url(images/tabletitlelight.png) repeat-x; text-transform: uppercase; - text-shadow: 0px 0px 2px rgba(64, 64, 255, 0.9); letter-spacing: 0.08em; -moz-box-shadow: inset 0px 0px 4px 0px #bbf; -moz-border-radius: 4px; @@ -370,4 +369,4 @@ a:active{ color: #f93; text-decoration: underline; font-weight: bold; -} \ No newline at end of file +} diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 14408f1ed..a411b0099 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 = 18; + public final static long BUILD = 0; /** for example "-test" */ - public final static String EXTRA = "-rc"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); diff --git a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java index 10fc9537a..29592bf52 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java @@ -386,7 +386,7 @@ public class EventPumper implements Runnable { // don't throw an NPE if the connect is gone again if(chan == null) return; - chan.configureBlocking(false);; + chan.configureBlocking(false); if (!_transport.allowConnection()) { if (_log.shouldLog(Log.WARN)) diff --git a/router/java/src/net/i2p/router/transport/ntcp/Reader.java b/router/java/src/net/i2p/router/transport/ntcp/Reader.java index ce21e13c3..c1029b26e 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/Reader.java +++ b/router/java/src/net/i2p/router/transport/ntcp/Reader.java @@ -17,6 +17,7 @@ import net.i2p.util.Log; class Reader { private RouterContext _context; private Log _log; + // TODO change to LBQ ?? private final List _pendingConnections; private List _liveReads; private List _readAfterLive;