From f61618e4a48214b60d67b882b7d1a0767a0cc169 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Wed, 23 Feb 2005 21:44:30 +0000
Subject: [PATCH] 2005-02-23  jrandom     * Now that we don't get stale SAM
 sessions, it'd be nice if we didn't       get stale tunnel pools, don't you
 think?

---
 history.txt                                                 | 6 +++++-
 router/java/src/net/i2p/router/RouterVersion.java           | 4 ++--
 router/java/src/net/i2p/router/tunnel/pool/RebuildJob.java  | 2 +-
 .../java/src/net/i2p/router/tunnel/pool/TunnelBuilder.java  | 1 +
 router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java  | 2 ++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/history.txt b/history.txt
index 4295e89fd3..d3745d5cbf 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.153 2005/02/22 23:20:29 jrandom Exp $
+$Id: history.txt,v 1.154 2005/02/23 00:00:53 jrandom Exp $
+
+2005-02-23  jrandom 
+    * Now that we don't get stale SAM sessions, it'd be nice if we didn't
+      get stale tunnel pools, don't you think?
 
 * 2005-02-23  0.5.0.1 released
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index af9488c793..539ad0b826 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.148 $ $Date: 2005/02/22 23:20:29 $";
+    public final static String ID = "$Revision: 1.149 $ $Date: 2005/02/23 00:00:53 $";
     public final static String VERSION = "0.5.0.1";
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/tunnel/pool/RebuildJob.java b/router/java/src/net/i2p/router/tunnel/pool/RebuildJob.java
index 7f40af6f4f..fb5cad7cb7 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/RebuildJob.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/RebuildJob.java
@@ -23,6 +23,6 @@ class RebuildJob extends JobImpl {
     }
     public String getName() { return "Rebuild tunnel"; }
     public void runJob() {
-        _pool.getBuilder().buildTunnel(getContext(), _pool);
+        _pool.refreshBuilders();
     }
 }
\ No newline at end of file
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelBuilder.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelBuilder.java
index 501ed3b5bd..009253e240 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelBuilder.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelBuilder.java
@@ -31,6 +31,7 @@ public class TunnelBuilder {
         buildTunnel(ctx, pool, false);
     }
     public void buildTunnel(RouterContext ctx, TunnelPool pool, boolean zeroHop) {
+        if (!pool.isAlive()) return;
         // this is probably overkill (ya think?)
         pool.refreshSettings();
         
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
index 64f49da85d..ba6fb1954c 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
@@ -81,6 +81,8 @@ public class TunnelPool {
      *
      */
     int refreshBuilders() {
+        if ( (_settings.getDestination() != null) && (!_context.clientManager().isLocal(_settings.getDestination())) )
+            _alive = false;
         if (!_alive) return 0;
         // only start up new build tasks if we need more of 'em
         int target = _settings.getQuantity() + _settings.getBackupQuantity();