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)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1211611 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 7 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
index c0d4d8a893..d6589bacdf 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
+++ b/qpid/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;