| Index: src/platform-solaris.cc
|
| diff --git a/src/platform-solaris.cc b/src/platform-solaris.cc
|
| index bbd982c319fd44b572ae296b44e5fca6d4b446a3..ca15b07f1103cfd684f792737e877e7063e2ab68 100644
|
| --- a/src/platform-solaris.cc
|
| +++ b/src/platform-solaris.cc
|
| @@ -683,8 +683,7 @@ class SignalSender : public Thread {
|
| ScopedLock lock(mutex_);
|
| SamplerRegistry::RemoveActiveSampler(sampler);
|
| if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) {
|
| - RuntimeProfiler::WakeUpRuntimeProfilerThreadBeforeShutdown();
|
| - instance_->Join();
|
| + RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_);
|
| delete instance_;
|
| instance_ = NULL;
|
| RestoreSignalHandler();
|
|
|