#2762: [Dubbo - qos-http] stopServer should be invoked ? (#2768)

apache · Nov 9, 2018 · 7629e73 · 7629e73
1 parent 86c4737
commit 7629e73
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java b/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java
@@ -74,13 +74,10 @@ public <T> Invoker<T> refer(Class<T> type, URL url) throws RpcException {
     @Override
     public void destroy() {
         protocol.destroy();
+        stopServer();
     }
 
     private void startQosServer(URL url) {
-        if (!hasStarted.compareAndSet(false, true)) {
-            return;
-        }
-
         try {
             boolean qosEnable = url.getParameter(QOS_ENABLE,true);
             if (!qosEnable) {
@@ -90,6 +87,10 @@ private void startQosServer(URL url) {
                 return;
             }
 
+            if (!hasStarted.compareAndSet(false, true)) {
+                return;
+            }
+
             int port = url.getParameter(QOS_PORT, DEFAULT_PORT);
             boolean acceptForeignIp = Boolean.parseBoolean(url.getParameter(ACCEPT_FOREIGN_IP,"false"));
             Server server = com.alibaba.dubbo.qos.server.Server.getInstance();
@@ -101,4 +102,11 @@ private void startQosServer(URL url) {
             logger.warn("Fail to start qos server: ", throwable);
         }
     }
+
+    /*package*/ void stopServer() {
+        if (hasStarted.compareAndSet(true, false)) {
+            Server server = Server.getInstance();
+            server.stop();
+        }
+    }
 }