diff options
Diffstat (limited to 'dotnet/Qpid.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; |