[dubbo] branch 2.7.8-dev updated: Fixes the issue of merging code in Github

[mercyblitz]

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

mercyblitz pushed a commit to branch 2.7.8-dev
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/2.7.8-dev by this push:
     new 6ae8c0e  Fixes the issue of merging code in Github
6ae8c0e is described below

commit 6ae8c0e037428b272826fa5f9100648b850445d9
Author: mercyblitz <mercybl...@gmail.com>
AuthorDate: Tue Jun 30 14:11:25 2020 +0800

    Fixes the issue of merging code in Github
---
 .../src/main/java/org/apache/dubbo/config/context/ConfigManager.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java 
b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index 4bc1660..868fadc 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -522,9 +522,4 @@ public class ConfigManager extends LifecycleAdapter 
implements FrameworkExt {
                 .filter(ConfigManager::isDefaultConfig)
                 .collect(Collectors.toList());
     }
-
-    @Override
-    public void destroy() throws IllegalStateException {
-        clear();
-    }
 }