[fix bug ] fix @TarsClient annotation parsing is incorrect

TarsCloud · Dec 6, 2019 · eca9fd1 · eca9fd1
1 parent f94e80a
commit eca9fd1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/core/src/main/java/com/qq/tars/client/ServantProxyConfig.java b/core/src/main/java/com/qq/tars/client/ServantProxyConfig.java
@@ -196,11 +196,20 @@ public String getSetDivision() {
     }
 
     public void setSetDivision(String setDivision) {
+        if (StringUtils.isEmpty(setDivision)) {
+            return;
+        }
         this.setDivision = setDivision;
         String[] tmp = StringUtils.split(setDivision, ".");
-        this.slaveSetName = tmp[0];
-        this.slaveSetArea = tmp[1];
-        this.slaveSetID = tmp[2];
+        if (tmp.length >= 3) {
+            this.slaveSetName = tmp[0];
+            this.slaveSetArea = tmp[1];
+            this.slaveSetID = tmp[2];
+        } else {
+            this.slaveName = "";
+            this.slaveSetArea = "";
+            this.slaveSetID = "";
+        }
         this.updateSlaveName();
     }
 

diff --git a/...ing-boot-starter/src/main/java/com/qq/tars/spring/bean/CommunicatorBeanPostProcessor.java b/...ing-boot-starter/src/main/java/com/qq/tars/spring/bean/CommunicatorBeanPostProcessor.java
@@ -69,10 +69,10 @@ private void processFields(Object bean, Field[] declaredFields) {
             ServantProxyConfig config = new ServantProxyConfig(objName);
             CommunicatorConfig communicatorConfig = ConfigurationManager.getInstance().getServerConfig().getCommunicatorConfig();
             config.setModuleName(communicatorConfig.getModuleName(), communicatorConfig.isEnableSet(), communicatorConfig.getSetDivision());
-            if (annotation.setDivision() != null) {
+            if (StringUtils.isNotEmpty(annotation.setDivision())) {
                 config.setEnableSet(true);
+                config.setSetDivision(annotation.setDivision());
             }
-            config.setSetDivision(annotation.setDivision());
             config.setConnections(annotation.connections());
             config.setConnectTimeout(annotation.connectTimeout());
             config.setSyncTimeout(annotation.syncTimeout());