diff options
| author | Diego Parra <diegolparra@gmail.com> | 2015-09-30 17:25:47 -0300 |
|---|---|---|
| committer | Diego Parra <diegolparra@gmail.com> | 2015-09-30 17:25:47 -0300 |
| commit | c62576a6c9d674aeb4ab8f4c15b32636717c822f (patch) | |
| tree | d425623767c641171dcc7aee09aaf8c4bf33324e /kamon-core | |
| parent | f338119f75aacd469b212ba835f290b2f2b39ad7 (diff) | |
| parent | 66436e404be1e565463a758f0d0e577e4fef5f02 (diff) | |
| download | Kamon-c62576a6c9d674aeb4ab8f4c15b32636717c822f.tar.gz Kamon-c62576a6c9d674aeb4ab8f4c15b32636717c822f.tar.bz2 Kamon-c62576a6c9d674aeb4ab8f4c15b32636717c822f.zip | |
Merge pull request #263 from jozic/shutdown
= core: don't throw an NPE during shutdown if Kamon hasn't been started
Diffstat (limited to 'kamon-core')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 9f4a7e3e..3c749b3a 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 = |