From d27f1bdb863b15aac929c81fc55fd536259ab9b2 Mon Sep 17 00:00:00 2001 From: Juan Gonzalez Date: Fri, 20 Jan 2017 12:48:47 +0100 Subject: Bug 510753 [http servlet] Invoke session listeners when unregistering them. Fix ListenerRegistration.equals so it gets actually removed from available EventListeners Signed-off-by: Juan Gonzalez --- .../equinox/http/servlet/tests/ServletTest.java | 81 ++++++++++++++++++++++ .../internal/context/ContextController.java | 10 ++- .../registration/ListenerRegistration.java | 19 ++++- .../internal/servlet/HttpSessionAdaptor.java | 32 +++++++++ 4 files changed, 136 insertions(+), 6 deletions(-) diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java index b2c1a24da..a0f8b4863 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java @@ -39,6 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import javax.servlet.Filter; @@ -49,6 +50,7 @@ import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletContextAttributeListener; +import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.ServletException; import javax.servlet.ServletRequest; @@ -3127,6 +3129,85 @@ public class ServletTest extends BaseTest { } @Test + public void test_Listener11() throws Exception { + + final AtomicInteger listenerBalance = new AtomicInteger(0); + final AtomicReference sessionReference = new AtomicReference(); + + ServletContextListener scl = new ServletContextListener() { + + @Override + public void contextInitialized(ServletContextEvent arg0) { + } + + @Override + public void contextDestroyed(ServletContextEvent arg0) { + listenerBalance.decrementAndGet(); + } + }; + + HttpSessionListener sl = new HttpSessionListener() { + + @Override + public void sessionDestroyed(HttpSessionEvent se) { + listenerBalance.incrementAndGet(); + } + + @Override + public void sessionCreated(HttpSessionEvent se) { + } + }; + + Servlet sA = new HttpServlet() { + private static final long serialVersionUID = 1L; + + @Override + protected void doGet( + HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + + HttpSession session = req.getSession(); + sessionReference.set(session); + + session.setAttribute("testAttribute", "testValue"); + PrintWriter writer = resp.getWriter(); + writer.write("S11 requested"); + } + }; + + Collection> registrations = new ArrayList>(); + try { + Dictionary scListenerProps = new Hashtable(); + scListenerProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER, "true"); + registrations.add(getBundleContext().registerService(ServletContextListener.class, scl, scListenerProps)); + + Dictionary sListenerProps = new Hashtable(); + sListenerProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER, "true"); + registrations.add(getBundleContext().registerService(HttpSessionListener.class, sl, sListenerProps)); + + Dictionary servletProps1 = new Hashtable(); + servletProps1.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S11"); + servletProps1.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/s11"); + registrations.add(getBundleContext().registerService(Servlet.class, sA, servletProps1)); + + String result = requestAdvisor.request("s11"); + Assert.assertEquals("S11 requested", result); + } + finally { + for (ServiceRegistration registration : registrations) { + registration.unregister(); + } + } + + //Emulate session expiration to check sessionListener + //is only called once (when unregister) + HttpSession session = sessionReference.get(); + + session.invalidate(); + + Assert.assertEquals(0, listenerBalance.get()); + } + public void test_Async1() throws Exception { Servlet s1 = new BaseAsyncServlet("test_Listener8"); diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java index a2d4a7227..019c6a3fb 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java @@ -15,9 +15,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.security.AccessController; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; import javax.servlet.*; @@ -786,6 +784,12 @@ public class ContextController { } } + public Map getActiveSessions() { + checkShutdown(); + + return activeSessions; + } + public Set> getEndpointRegistrations() { checkShutdown(); diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/ListenerRegistration.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/ListenerRegistration.java index ccbaf4d84..99c9e6625 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/ListenerRegistration.java +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/ListenerRegistration.java @@ -12,11 +12,12 @@ package org.eclipse.equinox.http.servlet.internal.registration; import java.lang.reflect.*; -import java.util.EventListener; -import java.util.List; +import java.util.*; import javax.servlet.*; +import javax.servlet.http.*; import org.eclipse.equinox.http.servlet.internal.context.ContextController; import org.eclipse.equinox.http.servlet.internal.context.ContextController.ServiceHolder; +import org.eclipse.equinox.http.servlet.internal.servlet.HttpSessionAdaptor; import org.osgi.framework.wiring.BundleWiring; import org.osgi.service.http.runtime.dto.ListenerDTO; @@ -65,6 +66,18 @@ public class ListenerRegistration extends Registration activeSessions = + contextController.getActiveSessions(); + + for (HttpSessionAdaptor adaptor : activeSessions.values()) { + adaptor.invokeSessionListeners(classes, super.getT()); + } + } + if (classes.contains(ServletContextListener.class)) { ServletContextListener servletContextListener = (ServletContextListener)super.getT(); @@ -88,7 +101,7 @@ public class ListenerRegistration extends Registration> classes, EventListener listener) { + if (classes == null) { + return; + } + + for (Class clazz : classes) { + if (clazz.equals(HttpSessionListener.class)){ + HttpSessionEvent sessionEvent = new HttpSessionEvent(this); + HttpSessionListener httpSessionListener = (HttpSessionListener) listener; + httpSessionListener.sessionDestroyed(sessionEvent); + } + + if (clazz.equals(HttpSessionBindingListener.class) || clazz.equals(HttpSessionAttributeListener.class)) { + Enumeration attributeNames = getAttributeNames(); + while (attributeNames.hasMoreElements()) { + String attributeName = attributeNames.nextElement(); + HttpSessionBindingEvent sessionBindingEvent = new HttpSessionBindingEvent(this, attributeName); + + if (clazz.equals(HttpSessionBindingListener.class)) { + HttpSessionBindingListener httpSessionBindingListener = (HttpSessionBindingListener) listener; + httpSessionBindingListener.valueUnbound(sessionBindingEvent); + } + + if (clazz.equals(HttpSessionAttributeListener.class)) { + HttpSessionAttributeListener httpSessionAttributeListener = (HttpSessionAttributeListener) listener; + httpSessionAttributeListener.attributeRemoved(sessionBindingEvent); + } + } + } + } + } + /**@deprecated*/ public void putValue(String arg0, Object arg1) { setAttribute(arg0, arg1); -- cgit v1.2.3