summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/TcpAcceptor.java
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-10-16 09:38:13 -0230
committerDwayne Boone <dwayne@zeroc.com>2009-10-16 09:38:13 -0230
commitb8b803f51c8ff622491d2a160663e4912f7dba03 (patch)
treeb4ded20bd5b2fa37a18943a5ac0665ce2d525128 /java/src/IceInternal/TcpAcceptor.java
parentAdded support for per-OA ACM and fix for retry on CloseConnectionException (diff)
downloadice-b8b803f51c8ff622491d2a160663e4912f7dba03.tar.bz2
ice-b8b803f51c8ff622491d2a160663e4912f7dba03.tar.xz
ice-b8b803f51c8ff622491d2a160663e4912f7dba03.zip
Added support for EndpointInfo and ConnectionInfo to python.
Set endpoint in Connection getInfo implementations. Removed unused _stateTime from ConnectionI. Remove ["cpp:virtual"] from SSLEndpointInfo slice definition.
Diffstat (limited to 'java/src/IceInternal/TcpAcceptor.java')
-rw-r--r--java/src/IceInternal/TcpAcceptor.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 50f46759f6f..74c24556065 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -66,7 +66,7 @@ class TcpAcceptor implements Acceptor
_logger.trace(_traceLevels.networkCat, s);
}
- return new TcpTransceiver(_instance, fd, true);
+ return new TcpTransceiver(_instance, _endpointInfo, fd, true);
}
public String
@@ -81,9 +81,10 @@ class TcpAcceptor implements Acceptor
return _addr.getPort();
}
- TcpAcceptor(Instance instance, String host, int port)
+ TcpAcceptor(Instance instance, Ice.TcpEndpointInfo endpointInfo)
{
_instance = instance;
+ _endpointInfo = endpointInfo;
_traceLevels = instance.traceLevels();
_logger = instance.initializationData().logger;
_backlog = instance.initializationData().properties.getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
@@ -110,7 +111,7 @@ class TcpAcceptor implements Acceptor
//
Network.setReuseAddress(_fd, true);
}
- _addr = Network.getAddressForServer(host, port, _instance.protocolSupport());
+ _addr = Network.getAddressForServer(_endpointInfo.host, _endpointInfo.port, _instance.protocolSupport());
if(_traceLevels.network >= 2)
{
String s = "attempting to bind to tcp socket " + toString();
@@ -135,6 +136,7 @@ class TcpAcceptor implements Acceptor
}
private Instance _instance;
+ private Ice.TcpEndpointInfo _endpointInfo;
private TraceLevels _traceLevels;
private Ice.Logger _logger;
private java.nio.channels.ServerSocketChannel _fd;