summaryrefslogtreecommitdiff
path: root/java/src/Ice/ConnectionI.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/Ice/ConnectionI.java')
-rw-r--r--java/src/Ice/ConnectionI.java21
1 files changed, 8 insertions, 13 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java
index da2b0b1aab6..7fb693abf3c 100644
--- a/java/src/Ice/ConnectionI.java
+++ b/java/src/Ice/ConnectionI.java
@@ -832,6 +832,12 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
return _adapter;
}
+ public Endpoint
+ getEndpoint()
+ {
+ return _endpoint; // No mutex protection necessary, _endpoint is immutable.
+ }
+
public ObjectPrx
createProxy(Identity ident)
{
@@ -1203,22 +1209,11 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
throw (Ice.LocalException)_exception.fillInStackTrace();
}
ConnectionInfo info = _transceiver.getInfo();
- info.endpoint = _endpoint.getInfo();
+ info.adapterName = _adapter != null ? _adapter.getName() : "";
+ info.incoming = _connector == null;
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.
- //
- public IceInternal.Transceiver
- getTransceiver()
- {
- return _transceiver;
- }
-
public String
_toString()
{