diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-16 15:01:08 -0230 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-16 15:01:08 -0230 |
commit | 667cf6024bbf1950da2eecffe65f00dc2169a9d6 (patch) | |
tree | a6efa0a355f8a2b1fa8f8b15fdf1d26ed91959f1 /java/src/IceSSL/ConnectorI.java | |
parent | Changed Glacier2 to enable ACM for client connections, bug 3244 and 4298 (diff) | |
download | ice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.tar.bz2 ice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.tar.xz ice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.zip |
Added Ruby implemetation of EndpointInfo and ConnectionInfo
Diffstat (limited to 'java/src/IceSSL/ConnectorI.java')
-rw-r--r-- | java/src/IceSSL/ConnectorI.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/java/src/IceSSL/ConnectorI.java b/java/src/IceSSL/ConnectorI.java index 07a12015439..32e8d4cf817 100644 --- a/java/src/IceSSL/ConnectorI.java +++ b/java/src/IceSSL/ConnectorI.java @@ -39,7 +39,7 @@ final class ConnectorI implements IceInternal.Connector try { javax.net.ssl.SSLEngine engine = _instance.createSSLEngine(false); - return new TransceiverI(_instance, _endpointInfo, engine, fd, connected, false, ""); + return new TransceiverI(_instance, engine, fd, _host, connected, false, ""); } catch(RuntimeException ex) { @@ -79,17 +79,18 @@ final class ConnectorI implements IceInternal.Connector // // Only for use by EndpointI. // - ConnectorI(Instance instance, SSLEndpointInfo endpointInfo, java.net.InetSocketAddress addr, String connectionId) + ConnectorI(Instance instance, String host, java.net.InetSocketAddress addr, int timeout, String connectionId) { _instance = instance; - _endpointInfo = endpointInfo; _logger = instance.communicator().getLogger(); + _host = host; _addr = addr; + _timeout = timeout; _connectionId = connectionId; _hashCode = _addr.getAddress().getHostAddress().hashCode(); _hashCode = 5 * _hashCode + _addr.getPort(); - _hashCode = 5 * _hashCode + _endpointInfo.timeout; + _hashCode = 5 * _hashCode + _timeout; _hashCode = 5 * _hashCode + _connectionId.hashCode(); } @@ -112,7 +113,7 @@ final class ConnectorI implements IceInternal.Connector return true; } - if(_endpointInfo.timeout != p._endpointInfo.timeout) + if(_timeout != p._timeout) { return false; } @@ -126,9 +127,10 @@ final class ConnectorI implements IceInternal.Connector } private Instance _instance; - private SSLEndpointInfo _endpointInfo; private Ice.Logger _logger; + private String _host; private java.net.InetSocketAddress _addr; + private int _timeout; private String _connectionId; private int _hashCode; } |