diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java b/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java index e606d345f75c..6d249f4284d0 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java +++ b/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java @@ -215,15 +215,18 @@ public TaskStatus call() } // Override task specific properties - for (String propName : task.getContext().keySet()) { - if (propName.startsWith(CHILD_PROPERTY_PREFIX)) { - command.add( - String.format( - "-D%s=%s", - propName.substring(CHILD_PROPERTY_PREFIX.length()), - task.getContextValue(propName) - ) - ); + final Map context = task.getContext(); + if (context != null) { + for (String propName : context.keySet()) { + if (propName.startsWith(CHILD_PROPERTY_PREFIX)) { + command.add( + String.format( + "-D%s=%s", + propName.substring(CHILD_PROPERTY_PREFIX.length()), + task.getContextValue(propName) + ) + ); + } } }