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

2006-04-06 jrandom

Browse Source 
* Fixed a typo in the reply cleanup code
This commit is contained in:
jrandom
2006-04-06 10:33:44 +00:00
committed by zzz
parent ac3c2d2b15
commit 5aa66795d2
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
history.txt
View File

@ -1,4 +1,7 @@
$Id: history.txt,v 1.445 2006/04/04 23:40:04 jrandom Exp $ $Id: history.txt,v 1.446 2006/04/05 12:08:04 jrandom Exp $
2006-04-06 jrandom
* Fixed a typo in the reply cleanup code
* 2006-04-05 0.6.1.14 released * 2006-04-05 0.6.1.14 released

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.385 $ $Date: 2006/04/04 23:40:10 $"; public final static String ID = "$Revision: 1.386 $ $Date: 2006/04/05 12:08:10 $";
public final static String VERSION = "0.6.1.14"; public final static String VERSION = "0.6.1.14";
public final static long BUILD = 0; public final static long BUILD = 1;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);

3
router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
View File

@ -123,7 +123,8 @@ public class GarlicMessageBuilder {
long timeFromNow = config.getExpiration() - ctx.clock().now(); long timeFromNow = config.getExpiration() - ctx.clock().now();
if (timeFromNow < 1*1000) { if (timeFromNow < 1*1000) {
log.error("Building a message expiring in " + timeFromNow + "ms: " + config, new Exception("created by")); if (log.shouldLog(Log.WARN))
log.warn("Building a message expiring in " + timeFromNow + "ms: " + config, new Exception("created by"));
return null; return null;
} }

13
router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
View File

@ -151,7 +151,8 @@ public class OutboundMessageRegistry {
if (oldMsg != null) { if (oldMsg != null) {
List multi = null; List multi = null;
if (oldMsg instanceof OutNetMessage) { if (oldMsg instanceof OutNetMessage) {
multi = Collections.synchronizedList(new ArrayList(4)); //multi = Collections.synchronizedList(new ArrayList(4));
multi = new ArrayList(4);
multi.add(oldMsg); multi.add(oldMsg);
multi.add(msg); multi.add(msg);
_selectorToMessage.put(sel, multi); _selectorToMessage.put(sel, multi);
@ -222,10 +223,12 @@ public class OutboundMessageRegistry {
List msgs = null; List msgs = null;
synchronized (_selectorToMessage) { synchronized (_selectorToMessage) {
Object o = _selectorToMessage.remove(sel); Object o = _selectorToMessage.remove(sel);
if (o instanceof OutNetMessage) if (o instanceof OutNetMessage) {
msg = (OutNetMessage)o; msg = (OutNetMessage)o;
else if (o instanceof List) } else if (o instanceof List) {
msgs = new ArrayList((List)o); //msgs = new ArrayList((List)o);
msgs = (List)o;
}
} }
if (msg != null) { if (msg != null) {
synchronized (_activeMessages) { synchronized (_activeMessages) {
@ -239,7 +242,7 @@ public class OutboundMessageRegistry {
_activeMessages.removeAll(msgs); _activeMessages.removeAll(msgs);
} }
for (int j = 0; j < msgs.size(); j++) { for (int j = 0; j < msgs.size(); j++) {
msg = (OutNetMessage)msgs.get(i); msg = (OutNetMessage)msgs.get(j);
Job fail = msg.getOnFailedReplyJob(); Job fail = msg.getOnFailedReplyJob();
if (fail != null) if (fail != null)
_context.jobQueue().addJob(fail); _context.jobQueue().addJob(fail);