From db5102aaaf9caeb2609747815d3694e57c7b48fa Mon Sep 17 00:00:00 2001 From: James William Dumay Date: Mon, 16 Feb 2009 00:28:50 +0000 Subject: [PATCH] MRM-1066 - Shutdown of Tomcat causes Exception when running Archiva Project git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@744785 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/archiva/web/startup/ArchivaStartup.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java index 6d3a0ddcb..4a3d1ba6e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java @@ -26,6 +26,8 @@ import org.apache.maven.archiva.common.ArchivaException; 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 class ArchivaStartup } } - 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(); + } } } -- 2.39.5