Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

2020-02-26 16:40:35 +01:00 · 2020-02-26 16:40:35 +01:00 · 2faec44dfb
parent 5ba9411e5c 65a22e5e80
commit 2faec44dfb
1 changed files with 2 additions and 1 deletions
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java
@ -155,8 +155,9 @@ public class HouseKeeper extends AbstractLifeCycle
                LOG.info("{} Stopped scavenging", _sessionIdManager.getWorkerName());
            }
            _task = null;
-            if (_ownScheduler)
+            if (_ownScheduler && _scheduler != null)
            {
+                _ownScheduler = false;
                _scheduler.stop();
                _scheduler = null;
            }