Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 009557C1F for ; Wed, 7 Dec 2011 19:33:31 +0000 (UTC) Received: (qmail 69238 invoked by uid 500); 7 Dec 2011 19:33:30 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 69218 invoked by uid 500); 7 Dec 2011 19:33:30 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 69211 invoked by uid 99); 7 Dec 2011 19:33:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 19:33:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 19:33:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E31E32388A32 for ; Wed, 7 Dec 2011 19:33:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211611 - in /qpid/trunk/qpid/java: client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java Date: Wed, 07 Dec 2011 19:33:05 -0000 To: commits@qpid.apache.org From: rajith@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111207193305.E31E32388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajith Date: Wed Dec 7 19:33:05 2011 New Revision: 1211611 URL: http://svn.apache.org/viewvc?rev=1211611&view=rev Log: QPID-3659 Added a method in AMQBrokerDetails to handle boolean properties which defaults to "True". I also added a log message to printout the TCP_NODELAY value returned by the sockets getTcpNoDelay() method as a way of figuring out the exact settings. (cherry picked from commit d2377ceb08af030e95ccc3d578df2d59ca3933c1) Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java?rev=1211611&r1=1211610&r2=1211611&view=diff ============================================================================== --- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java (original) +++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java Wed Dec 7 19:33:05 2011 @@ -264,12 +264,26 @@ public class AMQBrokerDetails implements 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 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; Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java?rev=1211611&r1=1211610&r2=1211611&view=diff ============================================================================== --- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java (original) +++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java Wed Dec 7 19:33:05 2011 @@ -60,7 +60,8 @@ public class IoNetworkTransport implemen 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())); --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org