From da5ab9174351eedf2b616ddbf0867e500c9a71c7 Mon Sep 17 00:00:00 2001
From: Danilo Costa Viana <dcviana@gmail.com>
Date: Tue, 18 Nov 2014 12:08:26 -0300
Subject: [PATCH] Implementação de solução para leak de memória em aplicações usando beans ViewScoped.

---
 archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml               |  8 +++++++-
 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewBeanStore.java   | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/SessionBeanStore.java     | 43 -------------------------------------------
 impl/extension/jsf/src/test/resources/exception-handler-authentication/web.xml                         |  3 +++
 impl/extension/jsf/src/test/resources/exception-handler-authorization/web.xml                          |  3 +++
 impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml                   |  3 +++
 impl/extension/jsf/src/test/resources/exception-handler-config/web.xml                                 |  3 +++
 impl/extension/jsf/src/test/resources/exception-handler-redirect-config-compatibility/web.xml          |  3 +++
 impl/extension/jsf/src/test/resources/exception-handler-redirect-config/web.xml                        |  3 +++
 impl/extension/jsf/src/test/resources/exception-handler-redirect/web.xml                               |  3 +++
 impl/extension/jsf/src/test/resources/message/web.xml                                                  |  3 +++
 impl/extension/jsf/src/test/resources/proxy/web.xml                                                    |  3 +++
 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/SessionListener.java              |  8 ++++----
 impl/extension/servlet/src/test/java/test/Tests.java                                                   |  2 ++
 impl/extension/servlet/src/test/resources/producer/request/web.xml                                     |  3 +++
 impl/extension/servlet/src/test/resources/producer/response/web.xml                                    |  3 +++
 impl/extension/servlet/src/test/resources/security/authentication/basic/web.xml                        |  3 +++
 impl/extension/servlet/src/test/resources/security/authentication/form/web.xml                         |  3 +++
 19 files changed, 162 insertions(+), 60 deletions(-)
 create mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewBeanStore.java
 delete mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/SessionBeanStore.java

diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index cafede6..c617609 100755
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -10,11 +10,17 @@
 	</listener>
  	-->
 
- 	<!-- If you are using servlet 2.5 then uncomment this listener -->
+ 	<!--
+ 	If you are using servlet 2.5 then uncomment those listeners and filters.
+ 	They're added automatically on servlet 3.0 or greater.
+ 	-->
  	<!--
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewBeanStore.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewBeanStore.java
new file mode 100644
index 0000000..9adda0e
--- /dev/null
+++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewBeanStore.java
@@ -0,0 +1,51 @@
+package br.gov.frameworkdemoiselle.internal.context;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.Alternative;
+
+/**
+ * Store that keeps view scoped beans. It associates all view scoped beans with a view ID.
+ * When the ID changes (meaning the view changed) all old view scoped beans are destroyed
+ * before new beans for the new view are created and stored.
+ * 
+ * @author SERPRO
+ *
+ */
+@Alternative
+public class FacesViewBeanStore implements Serializable {
+
+	private static final long serialVersionUID = -8265458933971929432L;
+
+	private Long lastViewId = null;
+
+	private BeanStore store;
+
+	synchronized BeanStore getStore(Long viewId, AbstractCustomContext context) {
+		if (lastViewId == null || !lastViewId.equals(viewId)) {
+			clear(context);
+			lastViewId = viewId;
+			store = AbstractCustomContext.createStore();
+		}
+
+		return store;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public void clear(AbstractCustomContext context) {
+		if (store != null) {
+			for (String id : store) {
+				Contextual contextual = context.getContextualStore().getContextual(id);
+				Object instance = store.getInstance(id);
+				CreationalContext creationalContext = store.getCreationalContext(id);
+
+				if (contextual != null && instance != null) {
+					contextual.destroy(instance, creationalContext);
+				}
+			}
+			store.clear();
+		}
+	}
+}
diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
index 0c34620..d583051 100644
--- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
+++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
@@ -39,17 +39,20 @@ package br.gov.frameworkdemoiselle.internal.context;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.spi.Context;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Alternative;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
 import br.gov.frameworkdemoiselle.context.ViewContext;
 import br.gov.frameworkdemoiselle.lifecycle.BeforeSessionDestroyed;
+import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.Faces;
 
 /**
@@ -67,7 +70,7 @@ public class FacesViewContextImpl extends AbstractCustomContext implements ViewC
 	
 	private final AtomicLong atomicLong = new AtomicLong();
 	
-	private ConcurrentHashMap<String, SessionBeanStore> sessionBeanStore = new ConcurrentHashMap<String, SessionBeanStore>();
+	private ConcurrentHashMap<String, FacesViewBeanStore> sessionBeanStore = new ConcurrentHashMap<String, FacesViewBeanStore>();
 	
 	private static final String FACES_KEY = FacesViewContextImpl.class.getCanonicalName();
 	
@@ -82,15 +85,22 @@ public class FacesViewContextImpl extends AbstractCustomContext implements ViewC
 
 	@Override
 	protected BeanStore getStore() {
-		final String sessionId = getSessionId();
-		
-		if (sessionId==null){
+		String sessionId = getSessionId();
+		if (sessionId == null){
 			return null;
 		}
 		
+		/*
+		 * Tenta obter o viewID de forma não thread-safe por questões de performance.
+		 * Se o viewID não existe entra em um trecho thread-safe para incrementa-lo, evitando
+		 * conflito entre duas requests tentando incrementar esse número. 
+		 */
 		Long viewId = (Long)Faces.getViewMap().get(FACES_KEY);
 		if (viewId==null){
 			synchronized (this) {
+				
+				//Tenta obte-lo novamente, caso entre a primeira tentativa e o bloqueio
+				//da thread outra thread já tenha criado o número. 
 				viewId = (Long)Faces.getViewMap().get(FACES_KEY);
 				if (viewId==null){
 					viewId = atomicLong.incrementAndGet();
@@ -99,24 +109,29 @@ public class FacesViewContextImpl extends AbstractCustomContext implements ViewC
 			}
 		}
 
-		SessionBeanStore currentStore = sessionBeanStore.get(sessionId);
+		//A mesma técnica de bloqueio de thread acima é usada aqui para
+		//criar um SessionBeanStore caso o mesmo ainda não exista.
+		FacesViewBeanStore currentStore = sessionBeanStore.get(sessionId);
 		if (currentStore==null){
 			synchronized (this) {
-				currentStore = (SessionBeanStore) sessionBeanStore.get(sessionId);
+				currentStore = (FacesViewBeanStore) sessionBeanStore.get(sessionId);
 				if (currentStore==null){
-					currentStore = new SessionBeanStore();
+					currentStore = new FacesViewBeanStore();
 					sessionBeanStore.put(sessionId, currentStore);
 				}
 			}
 		}
-		
+
 		return currentStore.getStore(viewId, this);
 	}
 	
-	protected void clearInvalidatedSession(@Observes BeforeSessionDestroyed event){
-		String sessionId = event.getSessionId();
+	/*
+	 * Called before the session is invalidated for that user.
+	 * Destroys all view scoped beans stored on that session.
+	 */
+	private void clearInvalidatedSession(String sessionId){
 		if (sessionId != null){
-			final SessionBeanStore store = sessionBeanStore.get(sessionId);
+			final FacesViewBeanStore store = sessionBeanStore.get(sessionId);
 			if (store!=null){
 				store.clear(this);
 				sessionBeanStore.remove(sessionId);
@@ -124,8 +139,40 @@ public class FacesViewContextImpl extends AbstractCustomContext implements ViewC
 		}
 	}
 	
+	/*
+	 * Returns the current session ID. Creates a session if one doesn't exist. Returns NULL if the session can't be created.
+	 */
 	private String getSessionId(){
 		final HttpSession session = (HttpSession) FacesContext.getCurrentInstance().getExternalContext().getSession(true);
 		return session!=null ? session.getId() : null;
 	}
+	
+	/**
+	 * Observes HTTP session lifecycle and notifies the ViewContext of session events (creation or destruction)
+	 * so view scoped beans can be created or destroyed based on their underlying session scopes.
+	 * 
+	 * @author SERPRO
+	 *
+	 */
+	@ApplicationScoped
+	protected static class FacesViewSessionListener {
+		
+		/**
+		 * Called before the session is invalidated for that user.
+		 * Destroys all view scoped beans stored on that session.
+		 */
+		protected void clearInvalidatedSession(@Observes BeforeSessionDestroyed event){
+			String sessionId = event.getSessionId();
+			try{
+				Context context = Beans.getBeanManager().getContext(ViewScoped.class);
+				if ( FacesViewContextImpl.class.isInstance(context) ){
+					((FacesViewContextImpl)context).clearInvalidatedSession(sessionId);
+				}
+			}
+			catch(ContextNotActiveException ce){
+				//Nada a fazer, contexto não está ativo. 
+			}
+		}
+	}
 }
+
diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/SessionBeanStore.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/SessionBeanStore.java
deleted file mode 100644
index e2b5d68..0000000
--- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/SessionBeanStore.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package br.gov.frameworkdemoiselle.internal.context;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-
-@SessionScoped
-public class SessionBeanStore implements Serializable {
-
-	private static final long serialVersionUID = -8265458933971929432L;
-
-	private Long lastViewId = null;
-
-	private BeanStore store;
-
-	synchronized BeanStore getStore(Long viewId, AbstractCustomContext context) {
-		if (lastViewId == null || !lastViewId.equals(viewId)) {
-			clear(context);
-			lastViewId = viewId;
-			store = AbstractCustomContext.createStore();
-		}
-
-		return store;
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public void clear(AbstractCustomContext context) {
-		if (store != null) {
-			for (String id : store) {
-				Contextual contextual = context.getContextualStore().getContextual(id);
-				Object instance = store.getInstance(id);
-				CreationalContext creationalContext = store.getCreationalContext(id);
-
-				if (contextual != null && instance != null) {
-					contextual.destroy(instance, creationalContext);
-				}
-			}
-			store.clear();
-		}
-	}
-}
diff --git a/impl/extension/jsf/src/test/resources/exception-handler-authentication/web.xml b/impl/extension/jsf/src/test/resources/exception-handler-authentication/web.xml
index c2a321e..6fb3bec 100644
--- a/impl/extension/jsf/src/test/resources/exception-handler-authentication/web.xml
+++ b/impl/extension/jsf/src/test/resources/exception-handler-authentication/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/test/resources/exception-handler-authorization/web.xml b/impl/extension/jsf/src/test/resources/exception-handler-authorization/web.xml
index 4ba6625..93699dd 100644
--- a/impl/extension/jsf/src/test/resources/exception-handler-authorization/web.xml
+++ b/impl/extension/jsf/src/test/resources/exception-handler-authorization/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml b/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml
index c2a321e..6fb3bec 100644
--- a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml
+++ b/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/test/resources/exception-handler-config/web.xml b/impl/extension/jsf/src/test/resources/exception-handler-config/web.xml
index c2a321e..6fb3bec 100644
--- a/impl/extension/jsf/src/test/resources/exception-handler-config/web.xml
+++ b/impl/extension/jsf/src/test/resources/exception-handler-config/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/test/resources/exception-handler-redirect-config-compatibility/web.xml b/impl/extension/jsf/src/test/resources/exception-handler-redirect-config-compatibility/web.xml
index fe1a20c..77e2142 100644
--- a/impl/extension/jsf/src/test/resources/exception-handler-redirect-config-compatibility/web.xml
+++ b/impl/extension/jsf/src/test/resources/exception-handler-redirect-config-compatibility/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/test/resources/exception-handler-redirect-config/web.xml b/impl/extension/jsf/src/test/resources/exception-handler-redirect-config/web.xml
index c2a321e..6fb3bec 100644
--- a/impl/extension/jsf/src/test/resources/exception-handler-redirect-config/web.xml
+++ b/impl/extension/jsf/src/test/resources/exception-handler-redirect-config/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/test/resources/exception-handler-redirect/web.xml b/impl/extension/jsf/src/test/resources/exception-handler-redirect/web.xml
index b8a230d..7f535d6 100644
--- a/impl/extension/jsf/src/test/resources/exception-handler-redirect/web.xml
+++ b/impl/extension/jsf/src/test/resources/exception-handler-redirect/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/test/resources/message/web.xml b/impl/extension/jsf/src/test/resources/message/web.xml
index c2a321e..6fb3bec 100644
--- a/impl/extension/jsf/src/test/resources/message/web.xml
+++ b/impl/extension/jsf/src/test/resources/message/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/jsf/src/test/resources/proxy/web.xml b/impl/extension/jsf/src/test/resources/proxy/web.xml
index e3b101e..be71c75 100644
--- a/impl/extension/jsf/src/test/resources/proxy/web.xml
+++ b/impl/extension/jsf/src/test/resources/proxy/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
 		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/SessionListener.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/SessionListener.java
index 0a2b452..508a5dc 100644
--- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/SessionListener.java
+++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/SessionListener.java
@@ -4,8 +4,8 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
-import br.gov.frameworkdemoiselle.lifecycle.BeforeSessionDestroyed;
 import br.gov.frameworkdemoiselle.lifecycle.AfterSessionCreated;
+import br.gov.frameworkdemoiselle.lifecycle.BeforeSessionDestroyed;
 
 /**
  * <p>Implements the {@link HttpSessionListener} interface and fires two events.</p>
@@ -19,14 +19,14 @@ import br.gov.frameworkdemoiselle.lifecycle.AfterSessionCreated;
  *
  */
 public class SessionListener implements HttpSessionListener {
-
+	
 	@Override
 	public void sessionCreated(final HttpSessionEvent sessionEvent) {
 		Beans.getBeanManager().fireEvent(new AfterSessionCreated() {
 			@Override
 			public String getSessionId() {
 				HttpSession session = sessionEvent.getSession();
-				return session != null ? session.getId() : null;
+				return session!=null ? session.getId() : null;
 			}
 		});
 	}
@@ -37,7 +37,7 @@ public class SessionListener implements HttpSessionListener {
 			@Override
 			public String getSessionId() {
 				HttpSession session = sessionEvent.getSession();
-				return session != null ? session.getId() : null;
+				return session!=null ? session.getId() : null;
 			}
 		});
 	}
diff --git a/impl/extension/servlet/src/test/java/test/Tests.java b/impl/extension/servlet/src/test/java/test/Tests.java
index 5448d20..792e9fe 100644
--- a/impl/extension/servlet/src/test/java/test/Tests.java
+++ b/impl/extension/servlet/src/test/java/test/Tests.java
@@ -54,6 +54,7 @@ import br.gov.frameworkdemoiselle.security.ServletAuthorizer;
 import br.gov.frameworkdemoiselle.util.BasicAuthFilter;
 import br.gov.frameworkdemoiselle.util.ServletFilter;
 import br.gov.frameworkdemoiselle.util.ServletListener;
+import br.gov.frameworkdemoiselle.util.SessionListener;
 
 @Ignore
 public final class Tests {
@@ -76,6 +77,7 @@ public final class Tests {
 				.addClass(ServletAuthorizer.class)
 				.addClass(ServletFilter.class)
 				.addClass(ServletListener.class)
+				.addClass(SessionListener.class)
 				.addClass(HttpServletRequestProducer.class)
 				.addClass(HttpServletResponseProducer.class)
 				.addClass(HttpSessionProducer.class)
diff --git a/impl/extension/servlet/src/test/resources/producer/request/web.xml b/impl/extension/servlet/src/test/resources/producer/request/web.xml
index a2e035c..24f95cd 100644
--- a/impl/extension/servlet/src/test/resources/producer/request/web.xml
+++ b/impl/extension/servlet/src/test/resources/producer/request/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
diff --git a/impl/extension/servlet/src/test/resources/producer/response/web.xml b/impl/extension/servlet/src/test/resources/producer/response/web.xml
index ab17f6b..cd6c45b 100644
--- a/impl/extension/servlet/src/test/resources/producer/response/web.xml
+++ b/impl/extension/servlet/src/test/resources/producer/response/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 	
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
diff --git a/impl/extension/servlet/src/test/resources/security/authentication/basic/web.xml b/impl/extension/servlet/src/test/resources/security/authentication/basic/web.xml
index de63266..f1a69a5 100644
--- a/impl/extension/servlet/src/test/resources/security/authentication/basic/web.xml
+++ b/impl/extension/servlet/src/test/resources/security/authentication/basic/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
diff --git a/impl/extension/servlet/src/test/resources/security/authentication/form/web.xml b/impl/extension/servlet/src/test/resources/security/authentication/form/web.xml
index a3a356a..7e559ce 100644
--- a/impl/extension/servlet/src/test/resources/security/authentication/form/web.xml
+++ b/impl/extension/servlet/src/test/resources/security/authentication/form/web.xml
@@ -40,6 +40,9 @@
 	<listener>
 		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.SessionListener</listener-class>
+	</listener>
 
 	<filter>
 		<filter-name>Demoiselle Servlet Filter</filter-name>
--
libgit2 0.21.2