shutdown niceness

3 files changed, 6 insertions, 0 deletions

diff --git a/db/db.vcxproj b/db/db.vcxproj
index 889de130304..9521c55eecc 100644
--- a/db/db.vcxproj
+++ b/db/db.vcxproj
@@ -450,6 +450,7 @@
     <ClCompile Include="..\util\stringutils.cpp" />

     <ClCompile Include="..\util\text.cpp" />

     <ClCompile Include="..\util\version.cpp" />

+    <ClCompile Include="cap.cpp" />

     <ClCompile Include="dbcommands_generic.cpp" />

     <ClCompile Include="geo\2d.cpp" />

     <ClCompile Include="geo\haystack.cpp" />

diff --git a/db/db.vcxproj.filters b/db/db.vcxproj.filters
index 702bba53aec..7e0e5d8ded2 100755
--- a/db/db.vcxproj.filters
+++ b/db/db.vcxproj.filters
@@ -388,6 +388,9 @@
     <ClCompile Include="geo\haystack.cpp">

       <Filter>db\geo</Filter>

     </ClCompile>

+    <ClCompile Include="cap.cpp">

+      <Filter>db\core</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="repl\rs_config.h">

diff --git a/util/concurrency/task.cpp b/util/concurrency/task.cpp
index 25d496a1e13..3806f652f6b 100644
--- a/util/concurrency/task.cpp
+++ b/util/concurrency/task.cpp
@@ -52,6 +52,8 @@ namespace mongo {
                 if( repeat == 0 )
                     break;
                 sleepmillis(repeat);
+                if( inShutdown() )
+                    break;
             }
         }