From 66436e404be1e565463a758f0d0e577e4fef5f02 Mon Sep 17 00:00:00 2001
From: Eugene Platonov <jozic@live.com>
Date: Wed, 30 Sep 2015 14:27:35 -0400
Subject: = core: don't throw an NPE during shutdown if Kamon hasn't been
 started

---
 kamon-core/src/main/scala/kamon/Kamon.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'kamon-core/src/main/scala')

diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
index 1c560d9f..9c843eb4 100644
--- a/kamon-core/src/main/scala/kamon/Kamon.scala
+++ b/kamon-core/src/main/scala/kamon/Kamon.scala
@@ -68,8 +68,10 @@ object Kamon {
 
   def shutdown(): Unit = {
     _coreComponents = None
-    _system.shutdown()
-    _system = null
+    if (_system ne null) {
+      _system.shutdown()
+      _system = null
+    }
   }
 
   def metrics: MetricsModule =
-- 
cgit v1.2.3