summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-28 07:57:23 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-28 07:57:23 +0000
commit382f0ca861f842242c0ed1c9a62b1d3bf8b562e8 (patch)
tree62e680ab3d4dbbe3c6f3a03cf55a82a35e6342e9 /qpid/java
parentc904951e1e871046eb2a8496c72de86214161886 (diff)
downloadqpid-python-382f0ca861f842242c0ed1c9a62b1d3bf8b562e8.tar.gz
QPID-6050 : [JMS AMQP 1.0 client] Allow system property for sync publish to be overridden at the connection level to restore "default" behaviour at the connection
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1621084 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
index 0f53d00af1..d361688399 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
@@ -330,7 +330,14 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
{
public void setOption(ConnectionOptions options, String value)
{
- options.syncPublish = Boolean.parseBoolean(value);
+ if("".equals(value) || "default".equals(value))
+ {
+ options.syncPublish = null;
+ }
+ else
+ {
+ options.syncPublish = Boolean.parseBoolean(value);
+ }
}
},
new OptionSetter("max-sessions", "set maximum number of sessions allowed")