From 8b41956091bc2e3bb75f935e422bdfe3188807ab Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 17 Dec 2012 14:52:02 +0000 Subject: [PATCH] 0.9.4 --- core/java/src/net/i2p/CoreVersion.java | 2 +- .../java/src/net/i2p/data/i2cp/SendMessageMessage.java | 2 +- history.txt | 6 ++++-- installer/install.xml | 2 +- installer/resources/checklist.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- .../i2p/router/transport/udp/OutboundMessageState.java | 10 ++++------ 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index dd2111bd4e..ef23880e03 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.9.3"; + public final static String VERSION = "0.9.4"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java index 956c530c31..d59fda03ee 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java @@ -66,7 +66,7 @@ public class SendMessageMessage extends I2CPMessageImpl { } /** - * @param 0 to 0xffffffff + * @param nonce 0 to 0xffffffff */ public void setNonce(long nonce) { _nonce = nonce; diff --git a/history.txt b/history.txt index 8694b32c80..d09fcb2d58 100644 --- a/history.txt +++ b/history.txt @@ -1,6 +1,8 @@ +* 2012-12-17 0.9.4 released + 2012-12-14 kytv -* German and Swedish translation updates from Transifex -* Update geoip.txt based on Maxmind GeoLite Country database from 2012-12-04 + * German and Swedish translation updates from Transifex + * Update geoip.txt based on Maxmind GeoLite Country database from 2012-12-04 2012-12-11 zzz * Wrapper: Use Tanuki's binary for armv7 diff --git a/installer/install.xml b/installer/install.xml index e1b7d322da..887994af5b 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.9.3 + 0.9.4 diff --git a/installer/resources/checklist.txt b/installer/resources/checklist.txt index 977ff9dc0e..07856b12c3 100644 --- a/installer/resources/checklist.txt +++ b/installer/resources/checklist.txt @@ -66,6 +66,9 @@ Generate PGP signatures: (end of tasks automated by 'ant release') ========================================= +Add magnet links to news.xml + +Seed update torrents Notify the following people: All in-network update hosts diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index ea17ad55f3..a411b00998 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 15; + public final static long BUILD = 0; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java index 99bd8e343b..98898e21c3 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java @@ -64,8 +64,7 @@ class OutboundMessageState implements CDPQEntry { /** * Called from UDPTransport - * TODO make two constructors, remove this, and make more things final - * @throws IAE if too big + * @throws IAE if too big or if msg or peer is null */ public OutboundMessageState(I2PAppContext context, I2NPMessage msg, PeerState peer) { this(context, null, msg, peer); @@ -73,17 +72,16 @@ class OutboundMessageState implements CDPQEntry { /** * Called from OutboundMessageFragments - * TODO make two constructors, remove this, and make more things final - * @throws IAE if too big + * @throws IAE if too big or if msg or peer is null */ public OutboundMessageState(I2PAppContext context, OutNetMessage m, PeerState peer) { this(context, m, m.getMessage(), peer); } /** - * Called from OutboundMessageFragments + * Internal. * @param m null if msg is "injected" - * @throws IAE if too big + * @throws IAE if too big or if msg or peer is null */ private OutboundMessageState(I2PAppContext context, OutNetMessage m, I2NPMessage msg, PeerState peer) { if (msg == null || peer == null)