Logger is now globally mutex protected.

1 files changed, 7 insertions, 1 deletions

diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index f7706247af5..23afb9597b9 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -17,7 +17,7 @@
 namespace Ice
 {
 
-class LoggerI : public Logger, public ::IceUtil::Mutex
+class LoggerI : public Logger
 {
 public:
     LoggerI(const std::string&);
@@ -30,6 +30,12 @@ private:
 
     std::string _prefix;
     std::string _emptyPrefix;
+
+    //
+    // A global mutex is used to avoid garbled output with multiple
+    // communicators.
+    //
+    static IceUtil::Mutex _globalMutex;
 };
 
 }