Merge pull request #78 from weibocom/fix/directUrlParse

fix parsing multi directurl
weibocom · May 27, 2016 · 70a0a17 · 70a0a17
2 parents f9f75ce + f0d6ad7
commit 70a0a17
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/motan-core/src/main/java/com/weibo/api/motan/cluster/support/ClusterSupport.java b/motan-core/src/main/java/com/weibo/api/motan/cluster/support/ClusterSupport.java
@@ -305,7 +305,7 @@ private List<URL> parseDirectUrls(String directUrlStr) {
         String[] durlArr = MotanConstants.COMMA_SPLIT_PATTERN.split(directUrlStr);
         List<URL> directUrls = new ArrayList<URL>();
         for (String dus : durlArr) {
-            URL du = URL.valueOf(dus);
+            URL du = URL.valueOf(StringTools.urlDecode(dus));
             if (du != null) {
                 directUrls.add(du);
             }

diff --git a/motan-core/src/main/java/com/weibo/api/motan/config/RefererConfig.java b/motan-core/src/main/java/com/weibo/api/motan/config/RefererConfig.java
@@ -157,7 +157,7 @@ private ClusterSupport<T> createClusterSupport(URL refUrl, ConfigHandler configH
                         durl.setHost(hostPort[0].trim());
                         durl.setPort(Integer.parseInt(hostPort[1].trim()));
                         durl.addParameter(URLParamType.nodeType.getName(), MotanConstants.NODE_TYPE_SERVICE);
-                        duBuf.append(StringTools.urlDecode(durl.toFullStr())).append(MotanConstants.COMMA_SEPARATOR);
+                        duBuf.append(StringTools.urlEncode(durl.toFullStr())).append(MotanConstants.COMMA_SEPARATOR);
                     }
                 }
                 if (duBuf.length() > 0) {

diff --git a/motan-core/src/main/java/com/weibo/api/motan/protocol/support/ProtocolFilterDecorator.java b/motan-core/src/main/java/com/weibo/api/motan/protocol/support/ProtocolFilterDecorator.java
@@ -83,7 +83,8 @@ private <T> Referer<T> decorateWithFilter(Referer<T> referer, URL url) {
             lastRef = new Referer<T>() {
                 @Override
                 public Response call(Request request) {
-                    if (!f.getClass().getAnnotation(Activation.class).retry() && request.getRetries() != 0) {
+                    Activation activation = f.getClass().getAnnotation(Activation.class);
+                    if (activation != null && !activation.retry() && request.getRetries() != 0) {
                         return lf.call(request);
                     }
                     return f.filter(lf, request);