[incubator-dubbo] branch master updated: fix issue #274: monitor的cluster一定是failsafe的，而且无法修改 (#3523)

[li...@apache.org]

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

liujun 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 4aaa542  fix issue #274: monitor的cluster一定是failsafe的，而且无法修改 (#3523)
4aaa542 is described below

commit 4aaa542e84b716fa40f7d0df4e1b222c5092b20b
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Tue Feb 26 09:55:29 2019 +0800

    fix issue #274: monitor的cluster一定是failsafe的，而且无法修改 (#3523)
    
    * fix issue #274: monitor的cluster一定是failsafe的，而且无法修改
    
    * remove unused import
---
 .../apache/dubbo/monitor/dubbo/DubboMonitorFactory.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java
index 1ac63e8..9d8e70f 100644
--- a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java
+++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java
@@ -16,7 +16,6 @@
  */
 package org.apache.dubbo.monitor.dubbo;
 
-import org.apache.dubbo.common.Constants;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.monitor.Monitor;
@@ -26,6 +25,10 @@ import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Protocol;
 import org.apache.dubbo.rpc.ProxyFactory;
 
+import static org.apache.dubbo.common.Constants.CHECK_KEY;
+import static org.apache.dubbo.common.Constants.PROTOCOL_KEY;
+import static org.apache.dubbo.common.Constants.REFERENCE_FILTER_KEY;
+
 /**
  * DefaultMonitorFactory
  */
@@ -45,21 +48,20 @@ public class DubboMonitorFactory extends AbstractMonitorFactory {
 
     @Override
     protected Monitor createMonitor(URL url) {
-        url = url.setProtocol(url.getParameter(Constants.PROTOCOL_KEY, "dubbo"));
+        url = url.setProtocol(url.getParameter(PROTOCOL_KEY, "dubbo"));
         if (StringUtils.isEmpty(url.getPath())) {
             url = url.setPath(MonitorService.class.getName());
         }
-        String filter = url.getParameter(Constants.REFERENCE_FILTER_KEY);
+        String filter = url.getParameter(REFERENCE_FILTER_KEY);
         if (StringUtils.isEmpty(filter)) {
             filter = "";
         } else {
             filter = filter + ",";
         }
-        url = url.addParameters(Constants.CLUSTER_KEY, "failsafe", Constants.CHECK_KEY, String.valueOf(false),
-                Constants.REFERENCE_FILTER_KEY, filter + "-monitor");
+        url = url.addParameters(CHECK_KEY, String.valueOf(false), REFERENCE_FILTER_KEY, filter + "-monitor");
         Invoker<MonitorService> monitorInvoker = protocol.refer(MonitorService.class, url);
         MonitorService monitorService = proxyFactory.getProxy(monitorInvoker);
         return new DubboMonitor(monitorInvoker, monitorService);
     }
 
-}
\ No newline at end of file
+}