Merge pull request apache#1703 from metamx/fix-npe

add null check for task context.
raunaqmorarka · Sep 4, 2015 · 9b5889b · 9b5889b
2 parents 75a5829 + 47aac99
commit 9b5889b
Showing 1 changed file with 12 additions and 9 deletions.
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
@@ -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<String, Object> 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)
+                                        )
+                                    );
+                                  }
                                 }
                               }