diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-11-11 10:19:08 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-11-11 10:19:08 +0000 |
| commit | 68ad20e377ffb92e0e42b170da8acc4b8d531132 (patch) | |
| tree | fb881c08b70fd5cc4a12e0c48acc913ea5d09449 /qpid/java/common/src/main | |
| parent | e766c47ca54d667c7e261f7d26d9b52aa5867cb8 (diff) | |
| download | qpid-python-68ad20e377ffb92e0e42b170da8acc4b8d531132.tar.gz | |
QPID-3610: set TCP_NODELAY to true by default, add new system property for changing default, add unit tests for system properties + connection url options.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1200803 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src/main')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java | 6 | ||||
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java index 62ded5b2d8..88e2fb0176 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java @@ -102,6 +102,12 @@ public class ClientProperties */ public static final int DEFAULT_SYNC_OPERATION_TIMEOUT = 60000; + /** + * System properties to change the default value used for TCP_NODELAY + */ + public static final String QPID_TCP_NODELAY_PROP_NAME = "qpid.tcp_nodelay"; + public static final String AMQJ_TCP_NODELAY_PROP_NAME = "amqj.tcp_nodelay"; + /* public static final QpidProperty<Boolean> IGNORE_SET_CLIENTID_PROP_NAME = QpidProperty.booleanProperty(false,"qpid.ignore_set_client_id","ignore_setclientID"); diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java index 37a8e594c0..2ee507e2ec 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java @@ -22,6 +22,8 @@ package org.apache.qpid.transport; import java.util.Map; +import org.apache.qpid.configuration.ClientProperties; + /** * A ConnectionSettings object can only be associated with * one Connection object. I have added an assertion that will @@ -38,7 +40,8 @@ public class ConnectionSettings String username = "guest"; String password = "guest"; int port = 5672; - boolean tcpNodelay = Boolean.getBoolean("amqj.tcp_nodelay"); + boolean tcpNodelay = Boolean.valueOf(System.getProperty(ClientProperties.QPID_TCP_NODELAY_PROP_NAME, + System.getProperty(ClientProperties.AMQJ_TCP_NODELAY_PROP_NAME, "true"))); int maxChannelCount = 32767; int maxFrameSize = 65535; int heartbeatInterval; |