Merge pull request #57 from wqliang/v1.6.x_setdivision

TimmyYu · web-flow · commit ae9514e2bcfd · 2020-01-09T10:23:09.000+08:00
[ISSUE #56] check setDivision not empty instead of not null
diff --git a/core/src/main/java/com/qq/tars/client/ObjectProxyFactory.java b/core/src/main/java/com/qq/tars/client/ObjectProxyFactory.java
@@ -51,7 +51,7 @@ public <T> ObjectProxy<T> getObjectProxy(Class<T> api, String objName, String se
             servantProxyConfig.setCommunicatorId(communicator.getId());
             servantProxyConfig.setModuleName(communicator.getCommunicatorConfig().getModuleName(), communicator.getCommunicatorConfig().isEnableSet(), communicator.getCommunicatorConfig().getSetDivision());
             servantProxyConfig.setLocator(communicator.getCommunicatorConfig().getLocator());
-            if (setDivision != null) {
+            if (!StringUtils.isEmpty(setDivision)) {
                 servantProxyConfig.setEnableSet(true);
                 servantProxyConfig.setSetDivision(setDivision);
             }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public <T> ObjectProxy<T> getObjectProxy(Class<T> api, String objName, String se`
`51`	`51`	`servantProxyConfig.setCommunicatorId(communicator.getId());`
`52`	`52`	`servantProxyConfig.setModuleName(communicator.getCommunicatorConfig().getModuleName(), communicator.getCommunicatorConfig().isEnableSet(), communicator.getCommunicatorConfig().getSetDivision());`
`53`	`53`	`servantProxyConfig.setLocator(communicator.getCommunicatorConfig().getLocator());`
`54`		`- if (setDivision != null) {`
	`54`	`+ if (!StringUtils.isEmpty(setDivision)) {`
`55`	`55`	`servantProxyConfig.setEnableSet(true);`
`56`	`56`	`servantProxyConfig.setSetDivision(setDivision);`
`57`	`57`	`}`