fix apache#1845 (apache#1851)

rolandhe · May 28, 2018 · 9700cba · 9700cba
1 parent 3ea614c
commit 9700cba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -454,7 +454,7 @@ public void setExtension(String extension) {
         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
@@ -39,7 +39,7 @@ public void testDestroy() throws Exception {
         MockProtocol2.delegate = protocol;
         ProtocolConfig protocolConfig = new ProtocolConfig();
         protocolConfig.setName("mockprotocol2");
-        protocolConfig.destory();
+        protocolConfig.destroy();
         Mockito.verify(protocol).destroy();
     }
 

diff --git a/...-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/...-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
@@ -557,10 +557,10 @@ private void destroyUnusedInvokers(Map<String, Invoker<T>> oldUrlInvokerMap, Map
                         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);
                         }
                     }
                 }