summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2012-06-08 20:08:34 +0000
committerRobert Godfrey <rgodfrey@apache.org>2012-06-08 20:08:34 +0000
commit0a79a0e69e94e5235d59f6764cf5976f4d8a8380 (patch)
tree012d25ec141b3d452a352df43cc067f047e75cba
parent5379465e0b2af3a0e4624e60769951ac703bc475 (diff)
downloadqpid-python-0a79a0e69e94e5235d59f6764cf5976f4d8a8380.tar.gz
QPID-4047 : [Java] Add timeout to socket connect
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1348224 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
index 56f6989aae..dfb318b80c 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
@@ -47,10 +47,10 @@ import org.slf4j.LoggerFactory;
public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNetworkTransport
{
private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(IoNetworkTransport.class);
+ private static final int TIMEOUT = 60000;
private Socket _socket;
private IoNetworkConnection _connection;
- private long _timeout = 60000;
private AcceptingThread _acceptor;
public NetworkConnection connect(ConnectionSettings settings, Receiver<ByteBuffer> delegate, SSLContext sslContext)
@@ -75,7 +75,7 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet
InetAddress address = InetAddress.getByName(settings.getHost());
- _socket.connect(new InetSocketAddress(address, settings.getPort()));
+ _socket.connect(new InetSocketAddress(address, settings.getPort()), TIMEOUT);
}
catch (SocketException e)
{
@@ -88,7 +88,7 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet
try
{
- _connection = new IoNetworkConnection(_socket, delegate, sendBufferSize, receiveBufferSize, _timeout);
+ _connection = new IoNetworkConnection(_socket, delegate, sendBufferSize, receiveBufferSize, TIMEOUT);
_connection.start();
}
catch(Exception e)
@@ -224,7 +224,7 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet
ProtocolEngine engine = _factory.newProtocolEngine();
- NetworkConnection connection = new IoNetworkConnection(socket, engine, sendBufferSize, receiveBufferSize, _timeout);
+ NetworkConnection connection = new IoNetworkConnection(socket, engine, sendBufferSize, receiveBufferSize, TIMEOUT);
if(_sslContext != null)
{