diff options
| author | Aidan Skinner <aidan@apache.org> | 2008-05-06 09:26:37 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2008-05-06 09:26:37 +0000 |
| commit | 62c72d3efd475f1f9b3e82deb05fdedf0223e498 (patch) | |
| tree | bc3d82e87d262a0a0e5eebded394396142f8be51 /dotnet/Qpid.Client/Client | |
| parent | 187caa499197542fadc01daf2ce48c8d7dce470f (diff) | |
| download | qpid-python-62c72d3efd475f1f9b3e82deb05fdedf0223e498.tar.gz | |
Merged revisions 652388-652389,652399,652567-652568,653416 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x
........
r652388 | ritchiem | 2008-04-30 15:40:18 +0100 (Wed, 30 Apr 2008) | 2 lines
QPID-889 : Removed _reapingStoreContext from CSDM replaced with local StoreContext()s so they are not reused by different threads.
........
r652389 | ritchiem | 2008-04-30 15:40:45 +0100 (Wed, 30 Apr 2008) | 1 line
QPID-887 : Renamed QueueHouseKeeping threads so they can be identified in thread dump. Named Queue-housekeeping-<virtualhost name>
........
r652399 | ritchiem | 2008-04-30 16:32:42 +0100 (Wed, 30 Apr 2008) | 1 line
QPID-888,QPID-886 : Fixed all management uses of _lock.lock / _lock.unlock so that they correctly call unlock from a finally block in the CSDM. There are two issues that cover that. QPID-888 - Fix the management ones and QPID-886 to fix the use in removeExpired.
........
r652567 | aidan | 2008-05-01 17:32:20 +0100 (Thu, 01 May 2008) | 1 line
QPID-994 Dont wait for attain state as connection is closed by we get CloseOk
........
r652568 | aidan | 2008-05-01 17:35:09 +0100 (Thu, 01 May 2008) | 1 line
QPID-1001 dont set the expiration time if TTL is 0
........
r653416 | aidan | 2008-05-05 11:24:50 +0100 (Mon, 05 May 2008) | 1 line
QPID-1019 prevent messages being dequeued unecessarily, from rgodfrey
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@653720 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dotnet/Qpid.Client/Client')
| -rw-r--r-- | dotnet/Qpid.Client/Client/AMQConnection.cs | 1 | ||||
| -rw-r--r-- | dotnet/Qpid.Client/Client/BasicMessageProducer.cs | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/dotnet/Qpid.Client/Client/AMQConnection.cs b/dotnet/Qpid.Client/Client/AMQConnection.cs index d0bebf1170..8e9ebdbdfb 100644 --- a/dotnet/Qpid.Client/Client/AMQConnection.cs +++ b/dotnet/Qpid.Client/Client/AMQConnection.cs @@ -263,7 +263,6 @@ namespace Apache.Qpid.Client _log.Debug("Blocking for connection close ok frame"); - _stateManager.AttainState(AMQState.CONNECTION_CLOSED); Disconnect(); } diff --git a/dotnet/Qpid.Client/Client/BasicMessageProducer.cs b/dotnet/Qpid.Client/Client/BasicMessageProducer.cs index ca6d2abee5..f33afc452e 100644 --- a/dotnet/Qpid.Client/Client/BasicMessageProducer.cs +++ b/dotnet/Qpid.Client/Client/BasicMessageProducer.cs @@ -306,7 +306,10 @@ namespace Apache.Qpid.Client if ( !_disableTimestamps ) { message.Timestamp = DateTime.UtcNow.Ticks; - message.Expiration = message.Timestamp + timeToLive; + if (timeToLive != 0) + { + message.Expiration = message.Timestamp + timeToLive; + } } else { message.Expiration = 0; |