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 | 6adaa335cc167bbb9ab91babd98ff892f3e57e33 (patch) | |
| tree | fe70c4621560120d507a10e6a2d91bd00af03e1e | |
| parent | 9e334eb7700c144cf5875fcd4581b56a1460e6ff (diff) | |
| parent | 03c98bb08accc1081e47374ad558e5dd452aea49 (diff) | |
| download | Kamon-6adaa335cc167bbb9ab91babd98ff892f3e57e33.tar.gz Kamon-6adaa335cc167bbb9ab91babd98ff892f3e57e33.tar.bz2 Kamon-6adaa335cc167bbb9ab91babd98ff892f3e57e33.zip | |
Merge pull request #263 from jozic/shutdown
= core: don't throw an NPE during shutdown if Kamon hasn't been started
| -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 = |