enhance shutdown hook in spring (#3008)

apache · Dec 18, 2018 · df219f3 · df219f3
1 parent e4acdf7
commit df219f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
@@ -86,8 +86,6 @@ public void doDestroy() {
         if (!destroyed.compareAndSet(false, true)) {
             return;
         }
-        // unregister the shutdownHook
-        unregister();
         // destroy all the registries
         AbstractRegistryFactory.destroyAll();
         // destroy all the protocols

diff --git a/...spring/src/main/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactory.java b/...spring/src/main/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactory.java
@@ -29,6 +29,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.event.ContextClosedEvent;
 
 import java.util.Set;
@@ -44,7 +45,10 @@ public class SpringExtensionFactory implements ExtensionFactory {
 
     public static void addApplicationContext(ApplicationContext context) {
         contexts.add(context);
-        DubboShutdownHook.getDubboShutdownHook().unregister();
+        if (context instanceof ConfigurableApplicationContext) {
+            ((ConfigurableApplicationContext) context).registerShutdownHook();
+            DubboShutdownHook.getDubboShutdownHook().unregister();
+        }
         BeanFactoryUtils.addApplicationListener(context, shutdownHookListener);
     }