From ac08f9f5bac96858e0ff552fb8137c7d72904e1c Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Wed, 14 Jun 2017 11:54:17 +0200 Subject: null-check the active span when creating HasContinuation instances --- kamon-core/src/main/scala/kamon/util/Mixin.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kamon-core/src/main/scala/kamon/util/Mixin.scala b/kamon-core/src/main/scala/kamon/util/Mixin.scala index f214e875..348b34f1 100644 --- a/kamon-core/src/main/scala/kamon/util/Mixin.scala +++ b/kamon-core/src/main/scala/kamon/util/Mixin.scala @@ -32,12 +32,14 @@ object HasContinuation { /** * Construct a HasContinuation instance by capturing a continuation from the provided active span. */ - def from(activeSpan: ActiveSpan): HasContinuation = - new Default(activeSpan.capture()) + def from(activeSpan: ActiveSpan): HasContinuation = { + val continuation = if(activeSpan == null) null else activeSpan.capture() + new Default(continuation) + } /** * Constructs a new HasContinuation instance using Kamon's tracer currently active span. */ def fromTracerActiveSpan(): HasContinuation = - new Default(Kamon.activeSpan().capture()) + new Default(Kamon.activeSpanContinuation()) } -- cgit v1.2.3