rabbah closed pull request #3278: Fix NullPointerException in
ActivationFinisher.
URL: https://github.com/apache/incubator-openwhisk/pull/3278
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/core/controller/src/main/scala/whisk/core/controller/actions/PrimitiveActions.scala
b/core/controller/src/main/scala/whisk/core/controller/actions/PrimitiveActions.scala
index 2e9d6b0644..2d23b861e7 100644
---
a/core/controller/src/main/scala/whisk/core/controller/actions/PrimitiveActions.scala
+++
b/core/controller/src/main/scala/whisk/core/controller/actions/PrimitiveActions.scala
@@ -270,12 +270,7 @@ protected[actions] object ActivationFinisher {
}
}
- def shutdown(): Unit = {
- preemptiveMsgs.foreach(_.cancel())
- preemptiveMsgs = Vector.empty
- context.stop(poller)
- context.stop(self)
- }
+ def shutdown(): Unit = Option(context).foreach(_.stop(self))
override def postStop() = {
logging.debug(this, "finisher shutdown")
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
