From 5f05631936cde4c2e21690e1b2ea1e3c1cfc33db Mon Sep 17 00:00:00 2001
From: complication <complication>
Date: Wed, 22 Feb 2006 06:19:19 +0000
Subject: [PATCH] 2006-02-21  Complication     * Reactivate TCP tranport by
 default, in addition to re-allowing

---
 history.txt                                                  | 5 ++++-
 .../java/src/net/i2p/router/transport/TransportManager.java  | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/history.txt b/history.txt
index fb0513274..4a7f965ff 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.413 2006/02/21 08:31:25 jrandom Exp $
+$Id: history.txt,v 1.414 2006/02/21 10:20:21 jrandom Exp $
+
+2006-02-21  Complication
+    * Reactivate TCP tranport by default, in addition to re-allowing
 
 * 2006-02-21  0.6.1.11 released
 
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index 0a060dac7..0d533622c 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -60,7 +60,8 @@ public class TransportManager implements TransportEventListener {
     
     private void configTransports() {
         String disableTCP = _context.router().getConfigSetting(PROP_DISABLE_TCP);
-        if ( !ALLOW_TCP || (disableTCP == null) || (Boolean.TRUE.toString().equalsIgnoreCase(disableTCP)) ) {
+        // Unless overridden by constant or explicit config property, start TCP tranport
+        if ( !ALLOW_TCP || ((disableTCP != null) && (Boolean.TRUE.toString().equalsIgnoreCase(disableTCP))) ) {
             _log.info("Explicitly disabling the TCP transport!");
         } else {
             Transport t = new TCPTransport(_context);