fixed incorrect shutdown sequence

timyates · Nov 29, 2011 · bfa5d20 · bfa5d20
1 parent 5ed7c46
commit bfa5d20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...plugin-tomcat/src/main/groovy/org/grails/plugins/tomcat/InlineExplodedTomcatServer.groovy b/...plugin-tomcat/src/main/groovy/org/grails/plugins/tomcat/InlineExplodedTomcatServer.groovy
@@ -115,9 +115,9 @@ class InlineExplodedTomcatServer extends TomcatServer {
     }
 
     void stop() {
+        ShutdownOperations.runOperations()
         tomcat.stop()
         tomcat.destroy()
-        ShutdownOperations.runOperations()
         GrailsPluginUtils.clearCaches()
     }
 

diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/context/GrailsContextLoader.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/context/GrailsContextLoader.java
@@ -132,9 +132,9 @@ public void closeWebApplicationContext(ServletContext servletContext) {
         ConfigurableApplicationContext parent = ctx != null ? (ConfigurableApplicationContext) ctx.getParent() : null;
 
         try {
-            super.closeWebApplicationContext(servletContext);
-        } finally {
             ShutdownOperations.runOperations();
+        } finally {
+            super.closeWebApplicationContext(servletContext);
         }
 
         if (parent != null) {