[incubator-dolphinscheduler] branch 1.3.2-release updated: [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure

[chenxingchun]

This is an automated email from the ASF dual-hosted git repository.

chenxingchun pushed a commit to branch 1.3.2-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.2-release by this push:
     new 2f6cf5c  [Fix-3433][api]Fixed that release the imported process 
definition which version is below 1.3.0 will be failure
     new 19fb2fd  Merge pull request #3434 from lgcareer/1.3.2-release-fix3433
2f6cf5c is described below

commit 2f6cf5cc411b4f5e6fc93898e172889564f7c3f7
Author: lgcareer <18610854...@163.com>
AuthorDate: Fri Aug 7 15:13:24 2020 +0800

    [Fix-3433][api]Fixed that release the imported process definition which 
version is below 1.3.0 will be failure
---
 .../apache/dolphinscheduler/api/service/ProcessDefinitionService.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
index 881e2fe..19b38ea 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
@@ -38,6 +38,7 @@ import org.apache.dolphinscheduler.common.model.TaskNode;
 import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
 import org.apache.dolphinscheduler.common.process.ProcessDag;
 import org.apache.dolphinscheduler.common.process.Property;
+import org.apache.dolphinscheduler.common.process.ResourceInfo;
 import org.apache.dolphinscheduler.common.task.AbstractParameters;
 import org.apache.dolphinscheduler.common.thread.Stopper;
 import org.apache.dolphinscheduler.common.utils.*;
@@ -176,7 +177,7 @@ public class ProcessDefinitionService extends 
BaseDAGService {
             String taskParameter = taskNode.getParams();
             AbstractParameters params = 
TaskParametersUtils.getParameters(taskNode.getType(),taskParameter);
             if (CollectionUtils.isNotEmpty(params.getResourceFilesList())) {
-                Set<Integer> tempSet = 
params.getResourceFilesList().stream().map(t->t.getId()).collect(Collectors.toSet());
+                Set<Integer> tempSet = 
params.getResourceFilesList().stream().filter(t->t.getId()!=0).map(ResourceInfo::getId).collect(Collectors.toSet());
                 resourceIds.addAll(tempSet);
             }
         }