Skip to content

Commit 1aa74e1

Browse files
author
shaolei
committed
deal conflict
1 parent 4333220 commit 1aa74e1

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky

dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private void submitApplicationV0() {
129129
status = result.get(apiResultDatasKey).get(DinkyTaskConstants.API_RESULT_SUCCESS).asBoolean();
130130
if (result.get(apiResultDatasKey).has(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID)
131131
&& !(result.get(apiResultDatasKey)
132-
.get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) {
132+
.get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) {
133133
jobInstanceId =
134134
result.get(apiResultDatasKey).get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID).asText();
135135
}
@@ -155,7 +155,7 @@ private void submitApplicationV1() {
155155
status = result.get(DinkyTaskConstants.API_RESULT_SUCCESS).asBoolean();
156156
if (result.get(apiResultDataKey).has(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID)
157157
&& !(result.get(apiResultDataKey)
158-
.get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) {
158+
.get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) {
159159
jobInstanceId =
160160
result.get(apiResultDataKey).get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID).asText();
161161
}
@@ -467,4 +467,4 @@ private String sendJsonStr(String url, String params) {
467467
return result;
468468
}
469469

470-
}
470+
}

0 commit comments

Comments
 (0)