Skip to content

Commit

Permalink
Router: reverse changes to RepublishLeaseSetJob
Browse files Browse the repository at this point in the history
  • Loading branch information
eyedeekay committed Oct 17, 2023
1 parent c67ff13 commit 00e3390
Showing 1 changed file with 2 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void runJob() {

try {
if (getContext().clientManager().isLocal(_dest)) {
LeaseSet ls = getContext().clientNetDb(_dest).lookupLeaseSetLocally(_dest);
LeaseSet ls = _facade.lookupLeaseSetLocally(_dest);
if (ls != null) {
if (!ls.isCurrent(Router.CLOCK_FUDGE_FACTOR)) {
if (_log.shouldLog(Log.WARN))
Expand Down Expand Up @@ -101,12 +101,7 @@ public OnRepublishFailure(LeaseSet ls) {

public void runJob() {
// Don't requeue if there's a newer LS, KNDF will have already done that
LeaseSet ls = null;
if (_dest != null)
ls = getContext().clientNetDb(_dest).lookupLeaseSetLocally(_ls.getHash());
else
getContext().netDb().lookupLeaseSetLocally(_ls.getHash());
// ^ _dest should never be null here, right? So maybe instead we return immediately?
LeaseSet ls = _facade.lookupLeaseSetLocally(_ls.getHash());
if (ls != null && ls.getEarliestLeaseDate() == _ls.getEarliestLeaseDate()) {
requeueRepublish();
} else {
Expand Down

0 comments on commit 00e3390

Please sign in to comment.