diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java | 28 | ||||
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java | 3 |
2 files changed, 23 insertions, 8 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java index c0d4d8a893..d6589bacdf 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java @@ -264,12 +264,26 @@ public class AMQBrokerDetails implements BrokerDetails public boolean getBooleanProperty(String propName) { - if (_options.containsKey(propName)) - { - return Boolean.parseBoolean(_options.get(propName)); - } - - return false; + return getBooleanProperty(propName, false); + } + + public boolean getBooleanProperty(String propName, boolean defaultValue) + { + if (_options.containsKey(propName)) + { + if (defaultValue) + { + return !_options.get(propName).equalsIgnoreCase("false"); + } + else + { + return Boolean.parseBoolean(_options.get(propName)); + } + } + else + { + return defaultValue; + } } public void setTimeout(long timeout) @@ -439,7 +453,7 @@ public class AMQBrokerDetails implements BrokerDetails if (getProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY) != null) { conSettings.setTcpNodelay( - getBooleanProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY)); + getBooleanProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY,true)); } return conSettings; 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 e1d1596ec5..838a662402 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 @@ -60,7 +60,8 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet LOGGER.debug("SO_RCVBUF : %s", _socket.getReceiveBufferSize()); LOGGER.debug("SO_SNDBUF : %s", _socket.getSendBufferSize()); - + LOGGER.debug("TCP_NODELAY : %s", _socket.getTcpNoDelay()); + InetAddress address = InetAddress.getByName(settings.getHost()); _socket.connect(new InetSocketAddress(address, settings.getPort())); |