Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-06-11 18:14:56 +02:00
commit 57e8c596be

View file

@ -871,7 +871,7 @@ public class RoutingHelper {
if (res.isCalculated()) { if (res.isCalculated()) {
route = res; route = res;
} else { } else {
evalWaitInterval = evalWaitInterval * 3 / 2; evalWaitInterval = Math.max(3000, evalWaitInterval * 3 / 2); // for Issue #3899
evalWaitInterval = Math.min(evalWaitInterval, 120000); evalWaitInterval = Math.min(evalWaitInterval, 120000);
} }
currentRunningJob = null; currentRunningJob = null;