[incubator-dubbo] branch master updated: fix #1845 (#1851)

[wangxin]

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 2262450  fix #1845 (#1851)
2262450 is described below

commit 22624508bbd30dd83b09b48303196d7dcd73c410
Author: lzj <371209...@qq.com>
AuthorDate: Mon May 28 10:21:15 2018 +0800

    fix #1845 (#1851)
---
 .../src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java        | 2 +-
 .../src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java    | 2 +-
 .../com/alibaba/dubbo/registry/integration/RegistryDirectory.java     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
index b15129b..f82fe04 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
@@ -454,7 +454,7 @@ public class ProtocolConfig extends AbstractConfig {
         this.extension = extension;
     }
 
-    public void destory() {
+    public void destroy() {
         if (name != null) {
             
ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(name).destroy();
         }
diff --git 
a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
 
b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
index 4d10c72..797471c 100644
--- 
a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
+++ 
b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java
@@ -39,7 +39,7 @@ public class ProtocolConfigTest {
         MockProtocol2.delegate = protocol;
         ProtocolConfig protocolConfig = new ProtocolConfig();
         protocolConfig.setName("mockprotocol2");
-        protocolConfig.destory();
+        protocolConfig.destroy();
         Mockito.verify(protocol).destroy();
     }
 
diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
index e832dae..4bd0908 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
@@ -557,10 +557,10 @@ public class RegistryDirectory<T> extends 
AbstractDirectory<T> implements Notify
                         try {
                             invoker.destroy();
                             if (logger.isDebugEnabled()) {
-                                logger.debug("destory invoker[" + 
invoker.getUrl() + "] success. ");
+                                logger.debug("destroy invoker[" + 
invoker.getUrl() + "] success. ");
                             }
                         } catch (Exception e) {
-                            logger.warn("destory invoker[" + invoker.getUrl() 
+ "] faild. " + e.getMessage(), e);
+                            logger.warn("destroy invoker[" + invoker.getUrl() 
+ "] faild. " + e.getMessage(), e);
                         }
                     }
                 }

-- 
To stop receiving notification emails like this one, please contact
wang...@apache.org.