Skip to content

Commit eb4e955

Browse files
author
eyedeekay
committed
Router: remove useless check from ClientManager. Use main netDb if the runner performing a lookup has a null destHash.
1 parent 9727f96 commit eb4e955

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

router/java/src/net/i2p/router/client/ClientManager.java

-5
Original file line numberDiff line numberDiff line change
@@ -785,11 +785,6 @@ public FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Ha
785785
if (_log.shouldLog(Log.DEBUG))
786786
_log.debug("Getting subDb for desthash: " + destHash);
787787
ClientConnectionRunner runner = getRunner(destHash);
788-
if (runner == null){
789-
if (_log.shouldLog(Log.WARN))
790-
_log.warn("ClientManager got a null runner in getClientFloodfillNetworkDatabaseFacade for " + destHash);
791-
return null;
792-
}
793788
if (_log.shouldLog(Log.DEBUG))
794789
_log.debug("ClientManager got a runner in getClientFloodfillNetworkDatabaseFacade for " + destHash);
795790
return runner.getFloodfillNetworkDatabaseFacade();

router/java/src/net/i2p/router/client/LookupDestJob.java

+5
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,11 @@ else if (_hash != null)
274274
* @return
275275
*/
276276
private FloodfillNetworkDatabaseFacade getRequiredFloodfillNetworkDatabaseFacade() {
277+
if (_runner.getDestHash() == null) {
278+
if (_log.shouldLog(Log.DEBUG))
279+
_log.debug("destHash is null in runner in lookup for " + _hash + " using the main DB instead");
280+
return getContext().netDb();
281+
}
277282
FloodfillNetworkDatabaseFacade fndf = _runner.getFloodfillNetworkDatabaseFacade();
278283
if (fndf == null){
279284
fndf = getContext().netDb();

0 commit comments

Comments
 (0)