底层优化

bbgb1984 · May 11, 2017 · 17e7dd5 · 17e7dd5
1 parent 650682d
commit 17e7dd5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
@@ -26,7 +26,7 @@ public static ExecutorRegistryThread getInstance(){
     public void start(final int port, final String ip, final String appName){
 
         // valid
-        if (AdminApiUtil.allowCallApi && (appName!=null && appName.trim().length()>0) ) {
+        if ( !(AdminApiUtil.allowCallApi() && (appName!=null && appName.trim().length()>0)) ) {
             logger.warn(">>>>>>>>>>>> xxl-job, executor registry config fail");
             return;
         }

diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/AdminApiUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/AdminApiUtil.java
@@ -28,30 +28,27 @@ public class AdminApiUtil {
 	public static final String REGISTRY = "/api/registry";
 
 	private static List<String> adminAddressList = null;
-	public static boolean allowCallApi = true;
-
 	public static void init(String adminAddresses){
 		// admin assress list
 		if (adminAddresses != null) {
 			Set<String> adminAddressSet = new HashSet<String>();
 			for (String adminAddressItem: adminAddresses.split(",")) {
-				if (adminAddressItem.trim().length()>0 && !adminAddressSet.contains(adminAddressItem)) {
+				if (adminAddressItem.trim().length()>0) {
 					adminAddressSet.add(adminAddressItem);
 				}
 			}
-			if (adminAddressSet==null || adminAddressSet.size()==0) {
-				adminAddressList = new ArrayList<String>(adminAddressSet);
-			}
+            adminAddressList = new ArrayList<String>(adminAddressSet);
 		}
-
-		// parse
-		allowCallApi = (adminAddressList!=null && adminAddressList.size()>0);
 	}
+	public static boolean allowCallApi(){
+        boolean allowCallApi = (adminAddressList!=null && adminAddressList.size()>0);
+        return allowCallApi;
+    }
 
 	public static ReturnT<String> callApiFailover(String subUrl, Object requestObj) throws Exception {
 
-		if (!allowCallApi) {
-			return new ReturnT<String>(ReturnT.FAIL_CODE, "allowCallback fail.");
+		if (!allowCallApi()) {
+			return new ReturnT<String>(ReturnT.FAIL_CODE, "allowCallApi fail.");
 		}
 
 		for (String adminAddress: adminAddressList) {