From f9e9fd645d9cb1bc639a09c63095c94042732c3d Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Thu, 27 Apr 2017 12:47:30 +0200
Subject: [PATCH] Issue #1510

---
 .../server/session/DefaultSessionIdManager.java      | 12 ++++--------
 .../eclipse/jetty/server/session/SessionHandler.java |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java
index 550288ec5d7..54717426271 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java
@@ -519,15 +519,11 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
     public Set<SessionHandler> getSessionHandlers()
     {
         Set<SessionHandler> handlers = new HashSet<>();
-
-        Handler[] contexts = _server.getChildHandlersByClass(ContextHandler.class);
-        for (int i=0; contexts!=null && i<contexts.length; i++)
+        Handler[] tmp = _server.getChildHandlersByClass(SessionHandler.class);
+        if (tmp != null)
         {
-            SessionHandler sessionHandler = ((ContextHandler)contexts[i]).getChildHandlerByClass(SessionHandler.class);
-            if (sessionHandler != null) 
-            {
-                handlers.add(sessionHandler);
-            }
+            for (Handler h:tmp)
+                handlers.add((SessionHandler)h);
         }
         return handlers;
     }
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
index c48330074c0..948627eb798 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
@@ -1257,7 +1257,7 @@ public class SessionHandler extends ScopedHandler
         if (isStopping() || isStopped())
             return;
         
-        if (LOG.isDebugEnabled()) LOG.debug("Scavenging sessions");
+        if (LOG.isDebugEnabled()) LOG.debug("{} scavenging sessions", this);
         //Get a snapshot of the candidates as they are now. Others that
         //arrive during this processing will be dealt with on 
         //subsequent call to scavenge