svn commit: r744785 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java

[jdumay]

Author: jdumay
Date: Mon Feb 16 00:28:50 2009
New Revision: 744785

URL: http://svn.apache.org/viewvc?rev=744785&view=rev
Log:
MRM-1066 - Shutdown of Tomcat causes Exception when running Archiva Project

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java?rev=744785&r1=744784&r2=744785&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
 Mon Feb 16 00:28:50 2009
@@ -26,6 +26,8 @@
 import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler;
 import org.codehaus.plexus.spring.PlexusToSpringUtils;
 import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -59,6 +61,12 @@
         }
     }
 
-    public void contextDestroyed(ServletContextEvent contextEvent) {
+    public void contextDestroyed(ServletContextEvent contextEvent)
+    {
+        ApplicationContext applicationContext = 
WebApplicationContextUtils.getRequiredWebApplicationContext(contextEvent.getServletContext());
+        if (applicationContext != null && applicationContext instanceof 
ClassPathXmlApplicationContext)
+        {
+            ((ClassPathXmlApplicationContext)applicationContext).close();
+        }
     }
 }