vanzin commented on a change in pull request #25551: [SPARK-28839][CORE] Avoids NPE in context cleaner when shuffle service is on URL: https://github.com/apache/spark/pull/25551#discussion_r316824964
########## File path: core/src/main/scala/org/apache/spark/scheduler/dynalloc/ExecutorMonitor.scala ########## @@ -476,7 +476,7 @@ private[spark] class ExecutorMonitor( } def removeShuffle(id: Int): Unit = { - if (shuffleIds.remove(id) && shuffleIds.isEmpty) { + if (shuffleIds != null && shuffleIds.remove(id) && shuffleIds.isEmpty) { Review comment: (And verify in the test that nothing was posted.) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org