diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index a1dc21cb3a43458fec31c20b71d1cb74d60f91d5..646f7985d459d8264ef315b7b36d910f4d4df791 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -477,8 +477,6 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad @Override public boolean floodfillEnabled() { - if (isMultihomeDb()) - return _context.netDb().floodfillEnabled(); return _floodfillEnabled; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index 620425b9dacea66c244a52c349ad998b759eeee8..cc5bc77ca25df9a2468e8f2bdb79c69bf5c11574 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -356,21 +356,6 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad return false; } - - /** - * Checks if the current database is a multihome database. - * - * @return true if the current database is a multihome database, false otherwise. - * @since 0.9.60 - */ - public boolean isMultihomeDb() { - // This is a null check in disguise, don't use .equals() here. - // FNDS.MAIN_DBID is always null, and if _dbid is null it is not the multihome Db - if (_dbid == FloodfillNetworkDatabaseSegmentor.MAIN_DBID) - return false; - return false; - } - public synchronized void startup() { _log.info("Starting up the kademlia network database"); RouterInfo ri = _context.router().getRouterInfo();