You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/12/20 15:20:16 UTC
[dubbo] branch 2.7.5-release updated: keep destroy protocols logic
the same with DubboShutdownHook (#5517)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.5-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.5-release by this push:
new df35785 keep destroy protocols logic the same with DubboShutdownHook (#5517)
df35785 is described below
commit df3578583893342e83787755b1e3747297269d3f
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Dec 20 23:20:07 2019 +0800
keep destroy protocols logic the same with DubboShutdownHook (#5517)
---
.../org/apache/dubbo/config/DubboShutdownHook.java | 20 --------------------
.../dubbo/config/bootstrap/DubboBootstrap.java | 17 ++++++++++++++---
2 files changed, 14 insertions(+), 23 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
index b35b8b9..b48ee81 100644
--- 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
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.config;
-import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.lang.ShutdownHookCallbacks;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
@@ -25,7 +24,6 @@ import org.apache.dubbo.config.event.DubboShutdownHookRegisteredEvent;
import org.apache.dubbo.config.event.DubboShutdownHookUnregisteredEvent;
import org.apache.dubbo.event.Event;
import org.apache.dubbo.event.EventDispatcher;
-import org.apache.dubbo.rpc.Protocol;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -121,22 +119,4 @@ public class DubboShutdownHook extends Thread {
eventDispatcher.dispatch(event);
}
- /**
- * Destroy all the protocols.
- */
- private void destroyProtocols() {
- ExtensionLoader<Protocol> loader = ExtensionLoader.getExtensionLoader(Protocol.class);
- for (String protocolName : loader.getLoadedExtensions()) {
- try {
- Protocol protocol = loader.getLoadedExtension(protocolName);
- if (protocol != null) {
- protocol.destroy();
- }
- } catch (Throwable t) {
- logger.warn(t.getMessage(), t);
- }
- }
- }
-
-
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
index a6cbd53..22eb3a2 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -1007,10 +1007,21 @@ public class DubboBootstrap extends GenericEventListener {
}
}
+ /**
+ * Destroy all the protocols.
+ */
private void destroyProtocols() {
- configManager.getProtocols().forEach(protocolConfig -> {
- ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(protocolConfig.getName()).destroy();
- });
+ ExtensionLoader<Protocol> loader = ExtensionLoader.getExtensionLoader(Protocol.class);
+ for (String protocolName : loader.getLoadedExtensions()) {
+ try {
+ Protocol protocol = loader.getLoadedExtension(protocolName);
+ if (protocol != null) {
+ protocol.destroy();
+ }
+ } catch (Throwable t) {
+ logger.warn(t.getMessage(), t);
+ }
+ }
if (logger.isDebugEnabled()) {
logger.debug(NAME + "'s all ProtocolConfigs have been destroyed.");
}