Author: pete.muir(a)jboss.org Date: 2009-06-03 08:14:53 -0400 (Wed, 03 Jun 2009) New Revision: 2748 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java Log: Actually disable session context at end of request Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-06-03 12:14:35 UTC (rev 2747) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-06-03 12:14:53 UTC (rev 2748) @@ -26,6 +26,7 @@ import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bootstrap.api.Service; +import org.jboss.webbeans.context.api.BeanStore; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; @@ -59,5 +60,17 @@ String beanStoreInfo = getBeanStore() == null ? "" : getBeanStore().toString(); return active + "session context " + beanStoreInfo; } + + @Override + public void setActive(boolean active) + { + super.setActive(active); + } + + @Override + public void setBeanStore(BeanStore beanStore) + { + super.setBeanStore(beanStore); + } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-06-03 12:14:35 UTC (rev 2747) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-06-03 12:14:53 UTC (rev 2748) @@ -153,6 +153,7 @@ } lifecycle.endRequest(request.getRequestURI(), beanStore); request.removeAttribute(REQUEST_ATTRIBUTE_NAME); + SessionContext.instance().setActive(false); SessionContext.instance().setBeanStore(null); } }