From be5fc116effe456cb9b74b277a3fb5c3988e6870 Mon Sep 17 00:00:00 2001 From: samz406 Date: Fri, 27 Dec 2019 17:20:34 +0800 Subject: [PATCH] update resource may NPE (#1610) * misspell words * modify common queue TaskQueueZKImplTest.java unit test * extends BaseTaskQueueTest get zkServer * modify zk config * update resource may NPE --- .../apache/dolphinscheduler/api/service/ResourcesService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java index 97db9ee1d7..66bf214608 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java @@ -210,7 +210,6 @@ public class ResourcesService extends BaseService { } Resource resource = resourcesMapper.selectById(resourceId); - String originResourceName = resource.getAlias(); if (resource == null) { putMsg(result, Status.RESOURCE_NOT_EXIST); return result; @@ -236,6 +235,7 @@ public class ResourcesService extends BaseService { } //get the file suffix + String originResourceName = resource.getAlias(); String suffix = originResourceName.substring(originResourceName.lastIndexOf(".")); //if the name without suffix then add it ,else use the origin name