From 980ab316cad2a95d2b4ac73882ceb2a3bb147b09 Mon Sep 17 00:00:00 2001
From: Jan Bartel
Date: Thu, 4 Feb 2016 10:45:33 +0100
Subject: 487198 ContextScopeListener should be called on context start and
 stop

---
 .../main/java/org/eclipse/jetty/server/handler/ContextHandler.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
index 745d56c9e6..dfb2459223 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -768,6 +768,8 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
             old_context = __context.get();
             __context.set(_scontext);
 
+            enterScope(null, getState());
+
             // defers the calling of super.doStart()
             startContext();
 
@@ -855,7 +857,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
         ClassLoader old_classloader = null;
         ClassLoader old_webapploader = null;
         Thread current_thread = null;
-
+        exitScope(null);
         Context old_context = __context.get();
         __context.set(_scontext);
         try
-- 
cgit v1.2.3