You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2017/03/07 15:34:11 UTC
[24/25] activemq-nms-ems git commit: Merged revision(s) 1708655 from
activemq/activemq-dotnet/Apache.NMS.EMS/trunk: Update existing TIBCO factory
connection when changing the exception settings. Refactor the parsing of
connection URL into single function
Merged revision(s) 1708655 from activemq/activemq-dotnet/Apache.NMS.EMS/trunk:
Update existing TIBCO factory connection when changing the exception settings.
Refactor the parsing of connection URL into single function.
Fixes [AMQNET-511]. (See https://issues.apache.org/jira/browse/AMQNET-511)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/commit/52adfd36
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/tree/52adfd36
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/diff/52adfd36
Branch: refs/heads/1.7.x
Commit: 52adfd362663d81f9e7fefdf5652a1298f3b7ee8
Parents: f4dbe8e
Author: Jim Gomes <jg...@apache.org>
Authored: Wed Oct 14 17:22:44 2015 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Wed Oct 14 17:22:44 2015 +0000
----------------------------------------------------------------------
src/main/csharp/ConnectionFactory.cs | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/52adfd36/src/main/csharp/ConnectionFactory.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/ConnectionFactory.cs b/src/main/csharp/ConnectionFactory.cs
index ba5959c..2b7f10b 100644
--- a/src/main/csharp/ConnectionFactory.cs
+++ b/src/main/csharp/ConnectionFactory.cs
@@ -89,11 +89,9 @@ namespace Apache.NMS.EMS
{
try
{
- this.brokerUri = ParseUriProperties(serverUrl);
- this.tibcoConnectionFactory = new TIBCO.EMS.ConnectionFactory(TrimParens(this.brokerUri.AbsolutePath), clientId, properties);
this.clientId = clientId;
this.properties = properties;
- ConfigureConnectionFactory();
+ this.BrokerUri = serverUrl;
}
catch(Exception ex)
{
@@ -133,13 +131,21 @@ namespace Apache.NMS.EMS
public bool ExceptionOnFTEvents
{
get { return this.exceptionOnFTEvents; }
- set { this.exceptionOnFTEvents = value; }
+ set
+ {
+ this.exceptionOnFTEvents = value;
+ TIBCO.EMS.Tibems.SetExceptionOnFTEvents(value);
+ }
}
public bool ExceptionOnFTSwitch
{
get { return this.exceptionOnFTSwitch; }
- set { this.exceptionOnFTSwitch = value; }
+ set
+ {
+ this.exceptionOnFTSwitch = value;
+ TIBCO.EMS.Tibems.SetExceptionOnFTSwitch(value);
+ }
}
public int ConnAttemptCount
@@ -251,19 +257,21 @@ namespace Apache.NMS.EMS
}
else
{
+ string brokerPath = TrimParens(this.brokerUri.AbsolutePath);
+
if(null == this.clientId)
{
- this.tibcoConnectionFactory = new TIBCO.EMS.ConnectionFactory(TrimParens(this.brokerUri.AbsolutePath));
+ this.tibcoConnectionFactory = new TIBCO.EMS.ConnectionFactory(brokerPath);
}
else
{
if(null == this.properties)
{
- this.tibcoConnectionFactory = new TIBCO.EMS.ConnectionFactory(TrimParens(this.brokerUri.AbsolutePath), this.clientId);
+ this.tibcoConnectionFactory = new TIBCO.EMS.ConnectionFactory(brokerPath, this.clientId);
}
else
{
- this.tibcoConnectionFactory = new TIBCO.EMS.ConnectionFactory(TrimParens(this.brokerUri.AbsolutePath), this.clientId, this.properties);
+ this.tibcoConnectionFactory = new TIBCO.EMS.ConnectionFactory(brokerPath, this.clientId, this.properties);
}
}
}