2004-11-29 jrandom

* Minor fixes to avoid unnecessary errors on shutdown (thanks susi!)
This commit is contained in:
jrandom
2004-11-29 23:24:49 +00:00
committed by zzz
parent e4b41f5bb0
commit 9f6584b55e
4 changed files with 9 additions and 4 deletions

View File

@ -1,4 +1,7 @@
$Id: history.txt,v 1.87 2004/11/28 20:58:39 jrandom Exp $
$Id: history.txt,v 1.88 2004/11/29 16:57:14 jrandom Exp $
2004-11-29 jrandom
* Minor fixes to avoid unnecessary errors on shutdown (thanks susi!)
2004-11-29 jrandom
* Reduced contention for local client delivery

View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
public final static String ID = "$Revision: 1.92 $ $Date: 2004/11/28 20:58:39 $";
public final static String ID = "$Revision: 1.93 $ $Date: 2004/11/29 16:57:14 $";
public final static String VERSION = "0.4.2";
public final static long BUILD = 5;
public final static long BUILD = 6;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID);

View File

@ -40,6 +40,7 @@ public class TCPConnectionEstablisher implements Runnable {
if (con != null) {
_transport.connectionEstablished(con);
} else {
if (!_context.router().isAlive()) return;
_transport.addConnectionErrorMessage(cb.getError());
Hash peer = info.getIdentity().getHash();
_context.profileManager().commErrorOccurred(peer);

View File

@ -2,6 +2,7 @@ package net.i2p.router.tunnelmanager;
import java.io.IOException;
import java.io.Writer;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@ -152,7 +153,7 @@ class TunnelPool {
*
*/
public Set getManagedTunnelIds() {
if (!_isLive) return null;
if (!_isLive) return Collections.EMPTY_SET;
Set ids = new HashSet(64);
synchronized (_outboundTunnels) {
ids.addAll(_outboundTunnels.keySet());