You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by df...@apache.org on 2021/04/09 20:11:24 UTC
[activemq-nms-stomp] branch main created (now 8bf8fcd)
This is an automated email from the ASF dual-hosted git repository.
dfoulks pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-nms-stomp.git.
at 8bf8fcd AMQNET-562 Update NOTICE file
This branch includes the following new commits:
new 1081666 Branch NMS.Stomp trunk to 1.7.x, using NMS API 1.7.1. Update trunk to 1.8.0.
new 7c891b7 Merged revision(s) 1689971 from activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.7.x: Fix exception being thrown when attempting to parse an ID that does not have an embedded ProducerSequenceId. Fixes [AMQNET-492]. (See https://issues.apache.org/jira/browse/AMQNET-492)
new 4ba60e9 Update to package script to 1.8-SNAPSHOT.
new d540daf AMQNET-562 Update NOTICE file
new 8bf8fcd AMQNET-562 Update NOTICE file
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[activemq-nms-stomp] 03/05: Update to package script to
1.8-SNAPSHOT.
Posted by df...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dfoulks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-nms-stomp.git
commit 4ba60e96c8282ef6779b559d2f720d2f8ba79f73
Author: Jim Gomes <jg...@apache.org>
AuthorDate: Fri Dec 11 19:49:19 2015 +0000
Update to package script to 1.8-SNAPSHOT.
---
package.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.ps1 b/package.ps1
index dec6a78..b7ba7f2 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.6-SNAPSHOT"
+$pkgver = "1.8-SNAPSHOT"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"
[activemq-nms-stomp] 01/05: Branch NMS.Stomp trunk to 1.7.x,
using NMS API 1.7.1. Update trunk to 1.8.0.
Posted by df...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dfoulks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-nms-stomp.git
commit 10816663a787ebd507353c078188f684b6b28899
Author: Jim Gomes <jg...@apache.org>
AuthorDate: Tue Jul 7 20:26:21 2015 +0000
Branch NMS.Stomp trunk to 1.7.x, using NMS API 1.7.1. Update trunk to 1.8.0.
---
nant.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nant.build b/nant.build
index 0966e76..63fa6b1 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS.Stomp" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.7.0" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="1.8.0" unless="${property::exists('project.version')}" />
<property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
<property name="project.short_description" value="Apache NMS for Stomp Class Library" />
<property name="project.description" value="Apache NMS for Stomp Class Library (.Net Messaging Library Implementation): An implementation of the NMS API for Stomp" />
@@ -46,7 +46,7 @@
<!-- Property grouping for 'vendor.apache.org' -->
<property name="vendor.apache.org.name" value="Apache.NMS" />
<property name="vendor.apache.org.group" value="org.apache.activemq" />
- <property name="vendor.apache.org.version" value="1.7.0" />
+ <property name="vendor.apache.org.version" value="1.8.0" />
<if test="${current.build.framework == 'mono-2.0' or current.build.framework == 'mono-4.0'}">
<property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.dll.mdb" />
</if>
[activemq-nms-stomp] 02/05: Merged revision(s) 1689971 from
activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.7.x: Fix exception
being thrown when attempting to parse an ID that does not have an embedded
ProducerSequenceId. Fixes [AMQNET-492]. (See
https://issues.apache.org/jira/browse/AMQNET-492)
Posted by df...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dfoulks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-nms-stomp.git
commit 7c891b7e237d9ab7eb24f2016466dc20690d6663
Author: Jim Gomes <jg...@apache.org>
AuthorDate: Wed Jul 8 22:06:54 2015 +0000
Merged revision(s) 1689971 from activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.7.x:
Fix exception being thrown when attempting to parse an ID that does not have an embedded ProducerSequenceId.
Fixes [AMQNET-492]. (See https://issues.apache.org/jira/browse/AMQNET-492)
---
src/main/csharp/Commands/MessageId.cs | 73 +++++++++++++++++------------------
1 file changed, 35 insertions(+), 38 deletions(-)
diff --git a/src/main/csharp/Commands/MessageId.cs b/src/main/csharp/Commands/MessageId.cs
index b559bc3..dd7e202 100644
--- a/src/main/csharp/Commands/MessageId.cs
+++ b/src/main/csharp/Commands/MessageId.cs
@@ -21,20 +21,19 @@ namespace Apache.NMS.Stomp.Commands
{
public class MessageId : BaseDataStructure
{
- ProducerId producerId;
- long producerSequenceId;
- long brokerSequenceId;
-
+ private ProducerId producerId;
+ private long producerSequenceId;
+ private long brokerSequenceId;
private string key = null;
public MessageId() : base()
{
}
- public MessageId(ProducerId producerId, long producerSequenceId) : base()
+ public MessageId(ProducerId prodId, long producerSeqId) : base()
{
- this.producerId = producerId;
- this.producerSequenceId = producerSequenceId;
+ this.producerId = prodId;
+ this.producerSequenceId = producerSeqId;
}
public MessageId(string value) : base()
@@ -61,12 +60,12 @@ namespace Apache.NMS.Stomp.Commands
///
public override string ToString()
{
- if( key == null )
+ if(null == this.key)
{
- key = producerId.ToString() + ":" + producerSequenceId;
+ this.key = string.Format("{0}:{1}", this.producerId.ToString(), this.producerSequenceId);
}
- return key;
+ return this.key;
}
/// <summary>
@@ -74,33 +73,42 @@ namespace Apache.NMS.Stomp.Commands
/// </summary>
public void SetValue(string messageKey)
{
- this.key = messageKey;
+ string mkey = messageKey;
+
+ this.key = mkey;
// Parse off the sequenceId
- int p = messageKey.LastIndexOf(":");
+ int p = mkey.LastIndexOf(":");
if(p >= 0)
{
- producerSequenceId = Int64.Parse(messageKey.Substring(p + 1));
- messageKey = messageKey.Substring(0, p);
+ if(Int64.TryParse(mkey.Substring(p + 1), out this.producerSequenceId))
+ {
+ mkey = mkey.Substring(0, p);
+ }
+ else
+ {
+ this.producerSequenceId = 0;
+ }
}
- producerId = new ProducerId(messageKey);
+
+ producerId = new ProducerId(mkey);
}
public ProducerId ProducerId
{
- get { return producerId; }
+ get { return this.producerId; }
set { this.producerId = value; }
}
public long ProducerSequenceId
{
- get { return producerSequenceId; }
+ get { return this.producerSequenceId; }
set { this.producerSequenceId = value; }
}
public long BrokerSequenceId
{
- get { return brokerSequenceId; }
+ get { return this.brokerSequenceId; }
set { this.brokerSequenceId = value; }
}
@@ -108,9 +116,9 @@ namespace Apache.NMS.Stomp.Commands
{
int answer = 0;
- answer = (answer * 37) + HashCode(ProducerId);
- answer = (answer * 37) + HashCode(ProducerSequenceId);
- answer = (answer * 37) + HashCode(BrokerSequenceId);
+ answer = (answer * 37) + HashCode(this.ProducerId);
+ answer = (answer * 37) + HashCode(this.ProducerSequenceId);
+ answer = (answer * 37) + HashCode(this.BrokerSequenceId);
return answer;
}
@@ -121,26 +129,15 @@ namespace Apache.NMS.Stomp.Commands
{
return Equals((MessageId) that);
}
+
return false;
}
public virtual bool Equals(MessageId that)
{
- if(!Equals(this.ProducerId, that.ProducerId))
- {
- return false;
- }
- if(!Equals(this.ProducerSequenceId, that.ProducerSequenceId))
- {
- return false;
- }
- if(!Equals(this.BrokerSequenceId, that.BrokerSequenceId))
- {
- return false;
- }
-
- return true;
+ return (Equals(this.ProducerId, that.ProducerId)
+ && Equals(this.ProducerSequenceId, that.ProducerSequenceId)
+ && Equals(this.BrokerSequenceId, that.BrokerSequenceId));
}
- };
-}
-
+ }
+}
\ No newline at end of file
[activemq-nms-stomp] 04/05: AMQNET-562 Update NOTICE file
Posted by df...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dfoulks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-nms-stomp.git
commit d540dafc0451baf4dc6ec933a2f5864dd397790b
Author: Timothy Bish <ta...@gmail.com>
AuthorDate: Mon Mar 13 09:42:02 2017 -0400
AMQNET-562 Update NOTICE file
Update date range to current year.
---
NOTICE.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index 6860153..1c50c18 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -5,7 +5,7 @@
=========================================================================
Apache ActiveMQ
-Copyright 2005-2006 The Apache Software Foundation
+Copyright 2005-2017 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
[activemq-nms-stomp] 05/05: AMQNET-562 Update NOTICE file
Posted by df...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dfoulks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-nms-stomp.git
commit 8bf8fcd1b5347dd4a538c71defc030dfbdeebf75
Author: Timothy Bish <ta...@gmail.com>
AuthorDate: Mon Mar 13 10:06:26 2017 -0400
AMQNET-562 Update NOTICE file
Updates
---
NOTICE.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index 1c50c18..98c5275 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -5,7 +5,7 @@
=========================================================================
Apache ActiveMQ
-Copyright 2005-2017 The Apache Software Foundation
+Copyright 2005-2017 The Apache Software Foundation.
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).