diff options
| author | Eugene Platonov <jozic@live.com> | 2015-09-30 14:27:35 -0400 |
|---|---|---|
| committer | Eugene Platonov <jozic@live.com> | 2015-09-30 14:27:35 -0400 |
| commit | 66436e404be1e565463a758f0d0e577e4fef5f02 (patch) | |
| tree | 448c98cb1bd4028e88392958b7013f77bd0a97dd /kamon-core/src/main/scala/kamon/Kamon.scala | |
| parent | 953e4f27f1d40eb33ae08df0e20f70e2f87d8a5b (diff) | |
| download | Kamon-66436e404be1e565463a758f0d0e577e4fef5f02.tar.gz Kamon-66436e404be1e565463a758f0d0e577e4fef5f02.tar.bz2 Kamon-66436e404be1e565463a758f0d0e577e4fef5f02.zip | |
= core: don't throw an NPE during shutdown if Kamon hasn't been started
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
| -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 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 = |