From 17e7dd5a283f0e2f4d664e38cef020e5a187af5a Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Thu, 11 May 2017 21:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E5=B1=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/thread/ExecutorRegistryThread.java   |  2 +-
 .../com/xxl/job/core/util/AdminApiUtil.java   | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 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
index 96646d65..ac3ab039 100644
--- 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 class ExecutorRegistryThread extends Thread {
     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
index eea8d3c6..5ae3526f 100644
--- 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) {
-- 
GitLab