Author: rgodfrey
Date: Fri Aug 29 08:57:02 2014
New Revision: 1621263
URL: http://svn.apache.org/r1621263
Log:
Merged QPID-6050 to the 0.30 branch
Modified:
qpid/branches/0.30/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
Modified:
qpid/branches/0.30/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java?rev=1621263&r1=1621262&r2=1621263&view=diff
==============================================================================
---
qpid/branches/0.30/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
(original)
+++
qpid/branches/0.30/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
Fri Aug 29 08:57:02 2014
@@ -138,7 +138,7 @@ public class ConnectionFactoryImpl imple
_remoteHost = remoteHost;
_ssl = ssl;
_maxSessions = maxSessions;
- if(! "".equals(System.getProperty("qpid.sync_publish","")))
+ if(System.getProperties().containsKey("qpid.sync_publish"))
{
_syncPublish = Boolean.getBoolean("qpid.sync_publish");
}
@@ -330,7 +330,14 @@ public class ConnectionFactoryImpl imple
{
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")
@@ -403,7 +410,6 @@ public class ConnectionFactoryImpl imple
int port = url.getPort();
final ConnectionOptions options = new ConnectionOptions();
-
if (port == -1)
{
if ("amqps".equals(protocol))
@@ -442,6 +448,11 @@ public class ConnectionFactoryImpl imple
}
}
+ if(System.getProperties().containsKey("qpid.sync_publish"))
+ {
+ options.syncPublish = Boolean.getBoolean("qpid.sync_publish");
+ }
+
OptionSetter.parseOptions(url, options);
if (options.remoteHost == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
