svn commit: r462530 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java

[mrdon]

Author: mrdon
Date: Tue Oct 10 12:48:19 2006
New Revision: 462530

URL: http://svn.apache.org/viewvc?view=rev&rev=462530
Log:
Added context destroyed for servlet context holder
WW-1466

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java?view=diff&rev=462530&r1=462529&r2=462530
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java
 Tue Oct 10 12:48:19 2006
@@ -54,7 +54,7 @@
      * @see 
javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
      */
     public void contextDestroyed(ServletContextEvent event) {
-
+       context = null;
     }
 
 }

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java?view=diff&rev=462530&r1=462529&r2=462530
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java
 Tue Oct 10 12:48:19 2006
@@ -35,6 +35,9 @@
         ServletContextHolderListener listener = new 
ServletContextHolderListener();
         listener.contextInitialized(event);
         assertSame(ServletContextHolderListener.getServletContext(), context);
+        
+        listener.contextDestroyed(event);
+        assertNull(ServletContextHolderListener.getServletContext());
     }
 
 }