NetDB: Skip LS verifies when shutting down

remove unneeded null check
This commit is contained in:
zzz
2014-04-06 15:15:23 +00:00
parent 6d46344171
commit e097a1caeb

View File

@ -56,12 +56,16 @@ class FloodfillStoreJob extends StoreJob {
protected void succeed() { protected void succeed() {
super.succeed(); super.succeed();
if (_state != null) {
if (_facade.isVerifyInProgress(_state.getTarget())) { if (_facade.isVerifyInProgress(_state.getTarget())) {
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info("Skipping verify, one already in progress for: " + _state.getTarget()); _log.info("Skipping verify, one already in progress for: " + _state.getTarget());
return; return;
} }
if (getContext().router().gracefulShutdownInProgress()) {
if (_log.shouldLog(Log.INFO))
_log.info("Skipping verify, shutdown in progress for: " + _state.getTarget());
return;
}
// Get the time stamp from the data we sent, so the Verify job can meke sure that // Get the time stamp from the data we sent, so the Verify job can meke sure that
// it finds something stamped with that time or newer. // it finds something stamped with that time or newer.
DatabaseEntry data = _state.getData(); DatabaseEntry data = _state.getData();
@ -81,7 +85,6 @@ class FloodfillStoreJob extends StoreJob {
} catch (NoSuchElementException nsee) {} } catch (NoSuchElementException nsee) {}
getContext().jobQueue().addJob(new FloodfillVerifyStoreJob(getContext(), _state.getTarget(), getContext().jobQueue().addJob(new FloodfillVerifyStoreJob(getContext(), _state.getTarget(),
published, isRouterInfo, sentTo, _facade)); published, isRouterInfo, sentTo, _facade));
}
} }
@Override @Override