diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-14 11:54:17 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-14 11:54:17 +0200 |
commit | ac08f9f5bac96858e0ff552fb8137c7d72904e1c (patch) | |
tree | b05def0d981b47e3826387d9b81e0cb6618a016f | |
parent | 9cb3d749e9e46f68e76da26fd394a7ac098461cf (diff) | |
download | Kamon-ac08f9f5bac96858e0ff552fb8137c7d72904e1c.tar.gz Kamon-ac08f9f5bac96858e0ff552fb8137c7d72904e1c.tar.bz2 Kamon-ac08f9f5bac96858e0ff552fb8137c7d72904e1c.zip |
null-check the active span when creating HasContinuation instances
-rw-r--r-- | kamon-core/src/main/scala/kamon/util/Mixin.scala | 8 |
1 files 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()) } |