diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-08-12 16:44:50 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-08-12 16:44:50 +0000 |
| commit | 2fb5e83e2036da3be394514803b5dc38cf867424 (patch) | |
| tree | edf8095f4952a6ebb75e9fbc5ff6ecf6ad2a687b /java/common/src/main | |
| parent | c3ca030e5e9460f3b1dd7f23cc810fad6fb5eac1 (diff) | |
| download | qpid-python-2fb5e83e2036da3be394514803b5dc38cf867424.tar.gz | |
QPID-4051: use the connecttimeout option value from the BrokerDetails object to control the connect() timeout via the produced ConnectionSettings object
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1372147 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/src/main')
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java | 11 | ||||
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java b/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java index c90a11594c..c7a7c319f3 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java +++ b/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java @@ -60,6 +60,7 @@ public class ConnectionSettings private int maxChannelCount = 32767; private int maxFrameSize = 65535; private int heartbeatInterval; + private int connectTimeout = 30000; private int readBufferSize = QpidProperty.intProperty(65535, RECEIVE_BUFFER_SIZE_PROP_NAME, LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME).get(); private int writeBufferSize = QpidProperty.intProperty(65535, SEND_BUFFER_SIZE_PROP_NAME, LEGACY_SEND_BUFFER_SIZE_PROP_NAME).get();; private long transportTimeout = 60000; @@ -345,6 +346,16 @@ public class ConnectionSettings this.trustStoreType = trustStoreType; } + public int getConnectTimeout() + { + return connectTimeout; + } + + public void setConnectTimeout(int connectTimeout) + { + this.connectTimeout = connectTimeout; + } + public int getReadBufferSize() { return readBufferSize; diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java index dfb318b80c..b1e8c2f0e9 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java +++ b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java @@ -75,7 +75,7 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet InetAddress address = InetAddress.getByName(settings.getHost()); - _socket.connect(new InetSocketAddress(address, settings.getPort()), TIMEOUT); + _socket.connect(new InetSocketAddress(address, settings.getPort()), settings.getConnectTimeout()); } catch (SocketException e) { |