never destroy log or background job mutexes, as they generated assertions on destruction in testing

5 files changed, 5 insertions, 5 deletions

diff --git a/stdafx.cpp b/stdafx.cpp
index cf35c210eea..aae9144b23a 100644
--- a/stdafx.cpp
+++ b/stdafx.cpp
@@ -134,5 +134,5 @@ namespace mongo {
         ss << "db version v" << versionString << ", pdfile version " << VERSION << "." << VERSION_MINOR;
         return ss.str();
     }
-    
+
 } // namespace mongo
diff --git a/util/background.cpp b/util/background.cpp
index 99f5733f399..4c8afacee58 100644
--- a/util/background.cpp
+++ b/util/background.cpp
@@ -21,7 +21,7 @@
 namespace mongo {
 
     BackgroundJob *BackgroundJob::grab = 0;
-    boost::mutex BackgroundJob::mutex;
+    boost::mutex &BackgroundJob::mutex = *( new boost::mutex );
 
     /* static */
     void BackgroundJob::thr() {
diff --git a/util/background.h b/util/background.h
index 605f524ec15..2a772f12f34 100644
--- a/util/background.h
+++ b/util/background.h
@@ -64,7 +64,7 @@ namespace mongo {
 
     private:
         static BackgroundJob *grab;
-        static boost::mutex mutex;
+        static boost::mutex &mutex;
         static void thr();
         volatile State state;
     };
diff --git a/util/log.h b/util/log.h
index db1a6c37c52..96fba916ec4 100644
--- a/util/log.h
+++ b/util/log.h
@@ -104,7 +104,7 @@ namespace mongo {
     
 #define LOGIT { boostlock lk(mutex); cout << x; return *this; }
     class Logstream : public Nullstream {
-        static boost::mutex mutex;
+        static boost::mutex &mutex;
     public:
         void flush() {
             boostlock lk(mutex);
diff --git a/util/util.cpp b/util/util.cpp
index 7052d39097a..db7139639f3 100644
--- a/util/util.cpp
+++ b/util/util.cpp
@@ -31,7 +31,7 @@ namespace mongo {
     Nullstream nullstream;
     Logstream logstream;
     int logLevel = 0;
-    boost::mutex Logstream::mutex;
+    boost::mutex &Logstream::mutex = *( new boost::mutex );
 
     bool goingAway = false;