summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index b8942d42aec..310f4575395 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -988,6 +988,12 @@ Ice::ConnectionI::getAdapter() const
return _adapter;
}
+EndpointPtr
+Ice::ConnectionI::getEndpoint() const
+{
+ return _endpoint; // No mutex protection necessary, _endpoint is immutable.
+}
+
ObjectPrx
Ice::ConnectionI::createProxy(const Identity& ident) const
{
@@ -1434,23 +1440,13 @@ Ice::ConnectionI::getInfo() const
{
_exception->ice_throw();
}
+
ConnectionInfoPtr info = _transceiver->getInfo();
- info->endpoint = _endpoint->getInfo();
+ info->incoming = _connector == 0;
+ info->adapterName = _adapter ? _adapter->getName() : string();
return info;
}
-//
-// Only used by the SSL plug-in.
-//
-// The external party has to synchronize the connection, since the
-// connection is the object that protects the transceiver.
-//
-IceInternal::TransceiverPtr
-Ice::ConnectionI::getTransceiver() const
-{
- return _transceiver;
-}
-
void
Ice::ConnectionI::exception(const LocalException& ex)
{