diff options
| author | Eric Milkie <milkie@10gen.com> | 2016-02-24 14:13:25 -0500 |
|---|---|---|
| committer | Jonathan Reams <jbreams@mongodb.com> | 2016-11-28 10:58:29 -0500 |
| commit | 5de23b5e043bc982b0fdd551db4c65abd641b4af (patch) | |
| tree | 30d39dfee8cb4671cb1b56403c2346b51dfcaab5 /src/third_party/boost-1.56.0/libs/thread/src/win32/thread.cpp | |
| parent | 72bd156012cd51a81037835dd976a8f34ef062b7 (diff) | |
| download | mongo-5de23b5e043bc982b0fdd551db4c65abd641b4af.tar.gz | |
SERVER-22838 avoid boost TLS assertion at process shutdown
(cherry picked from commit 27bd602a6e6ba29978a6468442a196731ecf14a0)
Diffstat (limited to 'src/third_party/boost-1.56.0/libs/thread/src/win32/thread.cpp')
| -rw-r--r-- | src/third_party/boost-1.56.0/libs/thread/src/win32/thread.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/third_party/boost-1.56.0/libs/thread/src/win32/thread.cpp b/src/third_party/boost-1.56.0/libs/thread/src/win32/thread.cpp index 54ebbf3e091..eb117d529ee 100644 --- a/src/third_party/boost-1.56.0/libs/thread/src/win32/thread.cpp +++ b/src/third_party/boost-1.56.0/libs/thread/src/win32/thread.cpp @@ -92,7 +92,10 @@ namespace boost } else { - BOOST_VERIFY(false); + // If we attempted to set the data to a null pointer, don't flag an error. + // This happens at shutdown, where boost has a race between thread and + // process exit handlers. + BOOST_VERIFY(!new_data); //boost::throw_exception(thread_resource_error()); } } |