From da47788738055e4fef1485f2721c6ee040c16fd8 Mon Sep 17 00:00:00 2001
From: Ivan Topolnak <ivantopo@gmail.com>
Date: Mon, 3 Jun 2013 12:39:48 -0300
Subject: Changed initialization order for Kamon companion object

---
 src/main/scala/kamon/Kamon.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/kamon/Kamon.scala b/src/main/scala/kamon/Kamon.scala
index 4cba2342..ef5f8044 100644
--- a/src/main/scala/kamon/Kamon.scala
+++ b/src/main/scala/kamon/Kamon.scala
@@ -4,11 +4,12 @@ import akka.actor.{Props, ActorSystem}
 
 object Kamon {
 
-  implicit val actorSystem = ActorSystem("kamon")
-
   val ctx = new ThreadLocal[Option[TraceContext]] {
     override def initialValue() = None
   }
+  
+  implicit lazy val actorSystem = ActorSystem("kamon")
+
 
   def context() = ctx.get()
   def clear = ctx.remove()
-- 
cgit v1.2.3