summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-28 07:49:52 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-28 07:49:52 +0000
commitc904951e1e871046eb2a8496c72de86214161886 (patch)
tree88a0151dea05cd4a82c59be2978af2f5c05359a7 /qpid/java
parent1a447157981d37cf6606ebbdd34ae1e912c43326 (diff)
downloadqpid-python-c904951e1e871046eb2a8496c72de86214161886.tar.gz
QPID-6050 : [JMS AMQP 1.0 client] Setting system property qpid.sync_publish does not have the intended effect
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1621083 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.java10
1 files changed, 9 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 eb2bb370ef..0f53d00af1 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
@@ -138,6 +138,10 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
_remoteHost = remoteHost;
_ssl = ssl;
_maxSessions = maxSessions;
+ if(System.getProperties().containsKey("qpid.sync_publish"))
+ {
+ _syncPublish = Boolean.getBoolean("qpid.sync_publish");
+ }
}
public ConnectionImpl createConnection() throws JMSException
@@ -399,7 +403,6 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
int port = url.getPort();
final ConnectionOptions options = new ConnectionOptions();
-
if (port == -1)
{
if ("amqps".equals(protocol))
@@ -438,6 +441,11 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
}
}
+ if(System.getProperties().containsKey("qpid.sync_publish"))
+ {
+ options.syncPublish = Boolean.getBoolean("qpid.sync_publish");
+ }
+
OptionSetter.parseOptions(url, options);
if (options.remoteHost == null)