diff options
Diffstat (limited to 'cpp/src/Ice/TcpTransceiver.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpTransceiver.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp index f4fbd688dde..1cf903bcfc2 100644 --- a/cpp/src/Ice/TcpTransceiver.cpp +++ b/cpp/src/Ice/TcpTransceiver.cpp @@ -280,7 +280,7 @@ IceInternal::TcpTransceiver::read(Buffer& buf, int timeout) string IceInternal::TcpTransceiver::toString() const { - return fdToString(_fd); + return _desc; } IceInternal::TcpTransceiver::TcpTransceiver(const InstancePtr& instance, SOCKET fd) : @@ -292,6 +292,11 @@ IceInternal::TcpTransceiver::TcpTransceiver(const InstancePtr& instance, SOCKET { FD_ZERO(&_rFdSet); FD_ZERO(&_wFdSet); + + // + // fdToString may raise a socket exception. + // + const_cast<string&>(_desc) = fdToString(_fd); } IceInternal::TcpTransceiver::~TcpTransceiver() |