From a7bd9d1dd9b65645c78fa449a0a600f63e8bf19e Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@intalio.com>
Date: Wed, 22 Apr 2015 15:39:35 +1000
Subject: [PATCH] 464989 AbstractSessionManager.removeEventListener() should
 remove HttpSessionIdListener

---
 .../eclipse/jetty/server/session/AbstractSessionManager.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
index 7ddcbd3933c..5a2e1b4751f 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
@@ -575,6 +575,9 @@ public abstract class AbstractSessionManager extends ContainerLifeCycle implemen
             _sessionAttributeListeners.remove(listener);
         if (listener instanceof HttpSessionListener)
             _sessionListeners.remove(listener);
+        if (listener instanceof HttpSessionIdListener)
+            _sessionIdListeners.remove(listener);
+        removeBean(listener);
     }
     
     /* ------------------------------------------------------------ */