Skip to content

Commit 57a70ed

Browse files
author
Hendrik Muhs
committed
check custom meta data to avoid NPE (#51163)
check custom meta data to avoid NPE, fixes a problem introduced in #51072 fixes #51153
1 parent f7d827d commit 57a70ed

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStopTransformAction.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,16 @@ static Tuple<Set<String>, Set<String>> findTasksWithoutConfig(ClusterState state
141141
Set<String> taskIds = new HashSet<>();
142142
Set<String> executorNodes = new HashSet<>();
143143

144-
Predicate<PersistentTask<?>> taskMatcher = Strings.isAllOrWildcard(new String[] { transformId }) ? t -> true : t -> {
145-
TransformTaskParams transformParams = (TransformTaskParams) t.getParams();
146-
return Regex.simpleMatch(transformId, transformParams.getId());
147-
};
148-
149-
for (PersistentTasksCustomMetaData.PersistentTask<?> pTask : tasks.findTasks(TransformField.TASK_NAME, taskMatcher)) {
150-
executorNodes.add(pTask.getExecutorNode());
151-
taskIds.add(pTask.getId());
144+
if (tasks != null) {
145+
Predicate<PersistentTask<?>> taskMatcher = Strings.isAllOrWildcard(new String[] { transformId }) ? t -> true : t -> {
146+
TransformTaskParams transformParams = (TransformTaskParams) t.getParams();
147+
return Regex.simpleMatch(transformId, transformParams.getId());
148+
};
149+
150+
for (PersistentTasksCustomMetaData.PersistentTask<?> pTask : tasks.findTasks(TransformField.TASK_NAME, taskMatcher)) {
151+
executorNodes.add(pTask.getExecutorNode());
152+
taskIds.add(pTask.getId());
153+
}
152154
}
153155

154156
return new Tuple<>(taskIds, executorNodes);

0 commit comments

Comments
 (0)