2 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index 56c5aebca18..a665ebcefef 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -434,7 +434,7 @@ IceInternal::Connection::prepareBatchRequest(BasicStream* os)
 
     //
     // Give the batch stream to the caller, until finishBatchRequest()
-    // is called.
+    // or abortBatchRequest() is called.
     //
     _batchStream.swap(*os);
 }
@@ -1072,6 +1072,8 @@ IceInternal::Connection::exception(const LocalException& ex)
 string
 IceInternal::Connection::toString() const
 {
+    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+    assert(_transceiver);
     return _transceiver->toString();
 }
 
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 1e79be144c1..628aad18371 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -507,6 +507,8 @@ IceInternal::IncomingConnectionFactory::exception(const LocalException&)
 string
 IceInternal::IncomingConnectionFactory::toString() const
 {
+    ::IceUtil::Monitor< ::IceUtil::Mutex>::Lock sync(*this);
+
     if(_transceiver)
     {
 	return _transceiver->toString();