From 4d8ffc85e288fe9d212afa39d5ac517389afd285 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 7 Jul 2008 14:09:16 +0000
Subject: [PATCH] * LoadTestManager: Don't instantiate, it's disabled
---
router/java/src/net/i2p/router/LoadTestManager.java | 2 +-
.../src/net/i2p/router/tunnel/pool/TunnelPoolManager.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/router/java/src/net/i2p/router/LoadTestManager.java b/router/java/src/net/i2p/router/LoadTestManager.java
index 203af4b0dd..0dbd9aceee 100644
--- a/router/java/src/net/i2p/router/LoadTestManager.java
+++ b/router/java/src/net/i2p/router/LoadTestManager.java
@@ -79,7 +79,7 @@ public class LoadTestManager {
private static final boolean DEFAULT_ENABLE = false;
/** disable all load testing for the moment */
- private static final boolean FORCE_DISABLE = true;
+ public static final boolean FORCE_DISABLE = true;
public static boolean isEnabled(I2PAppContext ctx) {
if (FORCE_DISABLE) return false;
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index e079be525f..559b0241af 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -45,7 +45,8 @@ public class TunnelPoolManager implements TunnelManagerFacade {
_clientInboundPools = new HashMap(4);
_clientOutboundPools = new HashMap(4);
- _loadTestManager = new LoadTestManager(_context);
+ if (! LoadTestManager.FORCE_DISABLE)
+ _loadTestManager = new LoadTestManager(_context);
_isShutdown = false;
_executor = new BuildExecutor(ctx, this);
@@ -305,7 +306,8 @@ public class TunnelPoolManager implements TunnelManagerFacade {
void buildComplete(PooledTunnelCreatorConfig cfg) {
buildComplete();
- _loadTestManager.addTunnelTestCandidate(cfg);
+ if (_loadTestManager != null)
+ _loadTestManager.addTunnelTestCandidate(cfg);
if (cfg.getLength() > 1) {
TunnelPool pool = cfg.getTunnelPool();
if (pool == null) {
--
GitLab