SERVER-22838 avoid boost TLS assertion at process shutdown

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());
             }
         }