From 3fc9df1d6eba50f22c5e58109d18ea0b9b45d26a Mon Sep 17 00:00:00 2001
From: Tboy <technoboy@yeah.net>
Date: Sun, 20 Oct 2019 22:09:22 +0800
Subject: [PATCH] fix the message (#1060)

* move updateTaskState into try/catch block in case of exception

* fix NPE

* using conf.getInt instead of getString

* for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
for AlertDao, correct the spelling.

* duplicate

* refactor getTaskWorkerGroupId

* add friendly log

* update hearbeat thread num = 1

* fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread

* 1. move verifyTaskInstanceIsNull after taskInstance
2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable

* fix the message
---
 .../dolphinscheduler/api/service/AccessTokenService.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
index 0a916330e0..88ecee4ab0 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
@@ -146,8 +146,7 @@ public class AccessTokenService extends BaseService {
     public Map<String, Object> delAccessTokenById(User loginUser, int id) {
         Map<String, Object> result = new HashMap<>(5);
         //only admin can operate
-        if (!isAdmin(loginUser)) {
-            putMsg(result, Status.USER_NOT_EXIST, id);
+        if (checkAdmin(loginUser, result)) {
             return result;
         }