summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Connection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Connection.cpp')
-rw-r--r--cpp/src/Ice/Connection.cpp4
1 files changed, 3 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();
}